--- a/i18n/eric5_fr.ts Fri Sep 02 08:35:45 2011 +0200 +++ b/i18n/eric5_fr.ts Sat Sep 03 16:41:44 2011 +0200 @@ -16771,97 +16771,97 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> @@ -17011,7 +17011,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="465"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -17109,12 +17109,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="135"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17487,17 +17487,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="136"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="168"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -17587,17 +17587,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="121"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="153"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -17718,37 +17718,37 @@ <context> <name>HgClient</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="82"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> - <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> @@ -17967,12 +17967,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="143"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -18274,7 +18274,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="313"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> @@ -18349,17 +18349,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="150"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -18397,17 +18397,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1130"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1127"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -18547,42 +18547,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> - <source>Deleted</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> + <source>Deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="681"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="490"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -18622,7 +18622,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> @@ -18637,7 +18637,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> @@ -19070,112 +19070,112 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="465"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> <source>Copy in repository</source> <translation type="unfinished">Copier dans le référentiel</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> + <source>Move in repository</source> + <translation type="unfinished">Déplacer dans le référentiel</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Move in repository</source> - <translation type="unfinished">Déplacer dans le référentiel</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> - <translation type="unfinished">Afficher un log limité</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> + <translation type="obsolete">Afficher un log limité</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> <source>Show difference (extended)</source> <translation type="unfinished">Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="237"/> <source>Show annotated file</source> <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Resolve conflict</source> + <translation type="unfinished">Résoudre les conflits</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> - <source>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> - <source>Resolve conflict</source> - <translation type="unfinished">Résoudre les conflits</translation> + <source>Select all local file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -19385,675 +19385,675 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show limited log</source> - <translation type="unfinished">Afficher un log limité</translation> + <translation type="obsolete">Afficher un log limité</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a limited log of the local project</source> - <translation type="unfinished">Afficher un log limité du projet local</translation> + <translation type="obsolete">Afficher un log limité du projet local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation type="unfinished"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> + <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation type="unfinished">Afficher les &différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <source>Show difference (extended)</source> <translation type="unfinished">Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> <source>Show &status</source> <translation type="unfinished">Affich&er l'état VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the status of the local project</source> <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation type="unfinished">&Recharger le projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Mer&ge changes...</source> <translation type="unfinished">&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> <translation type="unfinished">Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> <translation type="unfinished">Résoudre les con&fits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> <translation type="unfinished">Résout tous les conflits du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation type="unfinished"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>Tag in repository</source> <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation type="unfinished">&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Tag the local project in the repository</source> <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags</source> <translation type="unfinished">Lister les étiquettes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>List tags...</source> <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>List tags of the project</source> <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches</source> <translation type="unfinished">Lister les branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source>List branches...</source> <translation type="unfinished">Lister les branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> <source>List branches of the project</source> <translation type="unfinished">Liste les branches du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanup</source> <translation type="unfinished">Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source>Cleanu&p</source> <translation type="unfinished">&Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Cleanup the local project</source> <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Execute command</source> <translation type="unfinished">Exécuter une commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>E&xecute command...</source> <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command options</source> <translation type="unfinished">Options de commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> <source>Command &options...</source> <translation type="unfinished">&Options de commande...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -20073,132 +20073,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> @@ -20279,37 +20279,37 @@ <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="114"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="236"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="302"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="296"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -20383,17 +20383,17 @@ <translation type="unfinished">Message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="105"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -20411,12 +20411,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="92"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="97"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -20501,17 +20501,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="190"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="222"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -20531,7 +20531,7 @@ <translation type="unfinished">manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="295"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> @@ -20574,7 +20574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="125"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -21492,12 +21492,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="155"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="102"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -21588,32 +21588,32 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/> <source>Status</source> <translation type="unfinished">Etat (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="134"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="250"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> <source>yes</source> <translation type="unfinished">oui</translation> </message> @@ -38405,17 +38405,17 @@ <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -38425,12 +38425,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1039"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1063"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -38450,7 +38450,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -38465,22 +38465,22 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1556"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1607"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1427"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> @@ -38510,12 +38510,12 @@ <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1012"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> @@ -38540,22 +38540,22 @@ <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1740"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -38572,27 +38572,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1622"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1771"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -38768,27 +38768,27 @@ <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1900"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1924"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1960"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1950"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -38818,27 +38818,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="983"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1085"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1187"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1307"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1489"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -38854,7 +38854,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -39809,12 +39809,12 @@ <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Revision</source> <translation>Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="549"/> <source>Author</source> <translation>Auteur</translation> </message> @@ -40490,172 +40490,172 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="587"/> <source>Update from repository</source> <translation>Mettre à jour à partir du référentiel (update)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="596"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="590"/> <source>Commit changes to repository...</source> <translation>Appliquer des changements dans le référentiel. (commit)...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> <source>Add to repository</source> <translation>Ajouter au référentiel (add)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="350"/> <source>Add tree to repository</source> <translation>Ajouter l'arborescence au référentiel (add)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="494"/> <source>Copy in repository</source> <translation>Copier dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="496"/> <source>Move in repository</source> <translation>Déplacer dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="507"/> <source>Show log</source> <translation>Afficher le log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="617"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="621"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> <source>Show difference</source> <translation>Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="624"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show difference (extended)</source> <translation>Afficher les différences (étendu)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="627"/> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <source>Merge changes</source> + <translation>Fusionner les modifications</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> + <source>Resolve conflict</source> + <translation>Résoudre les conflits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> - <source>Merge changes</source> - <translation>Fusionner les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="639"/> - <source>Resolve conflict</source> - <translation>Résoudre les conflits</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="642"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> + <source>Select all local file entries</source> + <translation>Sélectionner tous les fichiers locaux</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> + <source>Select all versioned file entries</source> + <translation>Sélectionner tous les fichiers ayant une version</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> + <source>Select all local directory entries</source> + <translation>Sélectionner tous les répertoires locaux</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="649"/> - <source>Select all local file entries</source> - <translation>Sélectionner tous les fichiers locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> - <source>Select all versioned file entries</source> - <translation>Sélectionner tous les fichiers ayant une version</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> - <source>Select all local directory entries</source> - <translation>Sélectionner tous les répertoires locaux</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> <source>Select all versioned directory entries</source> <translation>Sélectionner tous les répertoires ayant une version</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="513"/> <source>Show limited log</source> - <translation>Afficher un log limité</translation> + <translation type="obsolete">Afficher un log limité</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> + <source>Lock</source> + <translation>Verrouiller</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="391"/> - <source>Lock</source> - <translation>Verrouiller</translation> + <source>Unlock</source> + <translation>Déverrouiller</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="394"/> - <source>Unlock</source> - <translation>Déverrouiller</translation> + <source>Break Lock</source> + <translation>Casser le verrouillage d'un autre utilisateur</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="397"/> - <source>Break Lock</source> - <translation>Casser le verrouillage d'un autre utilisateur</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="400"/> <source>Steal Lock</source> <translation>Voler le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="576"/> <source>Version Control</source> <translation>Contrôle de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="268"/> <source>Show annotated file</source> <translation>Afficher les fichiers annotés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show repository info</source> <translation>Afficher les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference (URLs)</source> <translation>Afficher les différences (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="516"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="510"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="610"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="604"/> <source>Add to Changelist</source> <translation>Ajouter à la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="607"/> <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> @@ -40783,477 +40783,477 @@ <translation><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show difference</source> <translation>Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> <source>Show &difference</source> <translation>Afficher les &différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <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/vcsPySvn/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> <source>Show difference (extended)</source> <translation>Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> <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/vcsPySvn/ProjectHelper.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="205"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> <source>Show &status</source> <translation>Affich&er l'état VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="209"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> <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/vcsPySvn/ProjectHelper.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> <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/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> <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/vcsPySvn/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> <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/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> <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/vcsPySvn/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> <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/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command options</source> + <translation>Options de commande</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> + <source>Command &options...</source> + <translation>&Options de commande...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> + <source>Show the VCS command options</source> + <translation>Affiche les options de commandes VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> + <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <source>Re&vert changes</source> + <translation>&Recharger le projet</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command options</source> - <translation>Options de commande</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> - <source>Command &options...</source> - <translation>&Options de commande...</translation> + <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/vcsPySvn/ProjectHelper.py" line="265"/> - <source>Show the VCS command options</source> - <translation>Affiche les options de commandes VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> - <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> - <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> - <source>Re&vert changes</source> - <translation>&Recharger le projet</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> - <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/vcsPySvn/ProjectHelper.py" line="280"/> <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/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> <source>Switch the local copy to another tag/branch</source> <translation>Bascule de la copie locale vers une autre branche/étiquette</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> <translation>Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> <translation>Résoudre les con&fits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> <translation>Résout tous les conflits du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="328"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> <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/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="341"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="344"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> <source>Execute an arbitrary VCS command</source> <translation>Exécuter une commande VCS arbitraire</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="347"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="354"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="357"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> <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/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="367"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="373"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> <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/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents</source> <translation>Listing du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="380"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> <source>List repository contents...</source> <translation>Listing du référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="383"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> <source>Lists the contents of the repository</source> <translation>Liste le contenu du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="386"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property</source> <translation>Définir une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> <source>Set Property...</source> <translation>Définir une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> <source>Set a property for the project files</source> <translation>Définit une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties</source> <translation>Lister les propriétés</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> <source>List Properties...</source> <translation>Lister les propriétés...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> <source>List properties of the project files</source> <translation>Liste des propriétés des fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property</source> <translation>Supprimer une propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Delete Property...</source> <translation>Supprimer une propriété...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> <source>Delete a property for the project files</source> <translation>Suppression d'une propriété pour les fichiers projets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show limited log</source> - <translation>Afficher un log limité</translation> + <translation type="obsolete">Afficher un log limité</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <source>Show a limited log of the local project</source> - <translation>Afficher un log limité du projet local</translation> + <translation type="obsolete">Afficher un log limité du projet local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> - <translation><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> <source>Show repository info</source> <translation>Affiche les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> <source>Show some repository related information for the local project</source> <translation>Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate</source> <translation>Déplacer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Déplacer...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="436"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> <source>Relocate the working copy to a new repository URL</source> <translation>Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="439"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> <source>Show difference (URLs)</source> <translation>Afficher les différences (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> <source>Show the difference of the project between two repository URLs</source> <translation>Affiche les différence du projet entre deux référentiels (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Affiche les différences (URLs)</b><p>Affiche les différences du projet entre deux référentiels indiqués par leurs URLs.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> <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/vcsPySvn/ProjectHelper.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <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/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> <source>Repository Browser...</source> <translation>Navigateur de référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> <source>Show the Repository Browser dialog</source> <translation>Affiche la fenêtre de navigation du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="453"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> <source>Show the configuration dialog with the Subversion page selected</source> <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> </message> @@ -53394,7 +53394,7 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> @@ -53410,14 +53410,14 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1201"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53702,7 +53702,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -53712,12 +53712,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1253"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>