--- a/src/eric7/i18n/eric7_fr.ts Thu Dec 19 16:06:08 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Thu Dec 19 19:32:37 2024 +0100 @@ -35619,317 +35619,317 @@ <translation><p>Le fichier <b>{0}</b> n'a pas pu être lu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2463" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1841" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1890" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Création en cours d'une branche sur le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> <source>Created new branch <{0}>.</source> <translation>Nouvelle branche créée <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Créer un fichier .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2415" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Faut-il mettre à jour le répertoire de travail ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2507" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Supprimer les fichiers de dépot Mercurial uniquement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2563" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2810" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2849" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3000" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2969" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Ajouter un sous-dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3056" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3038" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3025" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3317" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3318" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3458" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3459" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3470" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3621" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3622" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3662" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -38279,7 +38279,7 @@ <translation type="unfinished">Affichage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38320,7 +38320,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38377,8 +38377,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Basculer de version</translation> @@ -38409,263 +38409,270 @@ <translation>Déplacer le signet vers la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Erreur Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>Le projet devrai être relu. Le faire maintenant ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier patch <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -106261,19 +106268,19 @@ <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> @@ -106299,36 +106306,36 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1954" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>