--- a/i18n/eric6_fr.ts Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_fr.ts Sun Nov 06 17:02:45 2016 +0100
@@ -390,7 +390,7 @@
<context>
<name>AddBookmarkDialog</name>
<message>
- <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
+ <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
<source>Add Bookmark</source>
<translation>Ajouter un signet</translation>
</message>
@@ -1784,7 +1784,7 @@
<translation>Éditer &Adresse</translation>
</message>
<message>
- <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+ <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
<source>&Delete</source>
<translation>&Supprimer</translation>
</message>
@@ -2492,12 +2492,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
<source>From</source>
<translation type="unfinished">De</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
<source>To</source>
<translation type="unfinished">A</translation>
</message>
@@ -2659,7 +2659,7 @@
<translation>Cliquer pour annuler l'éditeur partagé</translation>
</message>
<message>
- <location filename="../Cooperation/ChatWidget.py" line="513"/>
+ <location filename="../Cooperation/ChatWidget.ui" line="230"/>
<source>Clear</source>
<translation>Effacer</translation>
</message>
@@ -2955,7 +2955,7 @@
<context>
<name>ClickToFlashWhitelistDialog</name>
<message>
- <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
+ <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
<source>ClickToFlash Whitelist</source>
<translation type="unfinished"></translation>
</message>
@@ -3312,37 +3312,37 @@
<translation type="unfinished">Message</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
<source>PEP-257</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
- <source>Eric</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+ <source>Eric</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
<source>Statistics...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
<source>Press to show some statistics for the last run</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
<source>Show</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
<source>Press to show all files containing an issue</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -3352,7 +3352,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
<source>No issues found.</source>
<translation type="unfinished"></translation>
</message>
@@ -3377,12 +3377,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
<source>{0} (ignored)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
<source>Preparing files...</source>
<translation type="unfinished"></translation>
</message>
@@ -3397,12 +3397,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
<source>Errors</source>
<translation type="unfinished">Erreurs</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
<source>Transferring data...</source>
<translation type="unfinished"></translation>
</message>
@@ -3506,6 +3506,11 @@
<source>&Reset Defaults</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+ <source>No files found (check your ignore list).</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CodeStyleCheckerPlugin</name>
@@ -4885,7 +4890,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+ <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
<source><no cookie selected></source>
<translation type="unfinished"></translation>
</message>
@@ -7625,7 +7630,7 @@
<context>
<name>DownloadManager</name>
<message>
- <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
+ <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
<source>Downloads</source>
<translation type="unfinished"></translation>
</message>
@@ -8097,92 +8102,92 @@
<translation type="unfinished">Boutons standards</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
<source>Abort</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
<source>Apply</source>
<translation type="unfinished">Appliquer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
<source>Cancel</source>
<translation type="unfinished">Annuler</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
<source>Close</source>
<translation type="unfinished">Fermer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
<source>Discard</source>
<translation type="unfinished">Abondonner les modifications</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
<source>Help</source>
<translation type="unfinished">Aide</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
<source>Ignore</source>
<translation type="unfinished">Ignorer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
<source>No</source>
<translation type="unfinished">Non</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
<source>No to all</source>
<translation type="unfinished">Non à tout</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
<source>Ok</source>
<translation type="unfinished">Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
<source>Open</source>
<translation type="unfinished">Ouvrir</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
<source>Reset</source>
<translation type="unfinished">Réinitialiser</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
<source>Restore defaults</source>
<translation type="unfinished">Restaurer les valeurs par défaut</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
<source>Retry</source>
<translation type="unfinished">Réessayer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
<source>Save all</source>
<translation type="unfinished">Tout enregistrer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
<source>Yes</source>
<translation type="unfinished">Oui</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
<source>Yes to all</source>
<translation type="unfinished">Oui à tout</translation>
</message>
@@ -10232,7 +10237,7 @@
<translation>Cliquer pour sélectionner un fichier API à partir des fichiers installés</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/>
<source>Add from installed APIs</source>
<translation>Ajouter à partir des APIs installés</translation>
</message>
@@ -10242,7 +10247,7 @@
<translation>Cliquer pour compiler les APIs sélectionnés</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
<source>Compile APIs</source>
<translation>Compiler les APIs</translation>
</message>
@@ -10267,7 +10272,7 @@
<translation>Cliquer pour sélectionner un fichier API à partir de la liste des APIs installés pour les plugins</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/>
<source>Add from Plugin APIs</source>
<translation>Ajouter à partir des APIs de plugins</translation>
</message>
@@ -11286,7 +11291,7 @@
<translation>Cocher pour appliquer le style jusqu'en fin de ligne.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
<source>Fill to end of line</source>
<translation>Appliquer jusqu'à la fin de ligne</translation>
</message>
@@ -11331,7 +11336,7 @@
<translation>Sélectionner la police.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
<source>Font</source>
<translation>Police</translation>
</message>
@@ -12798,7 +12803,7 @@
<translation>Mode:</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
<source>Disabled</source>
<translation>Désactivé</translation>
</message>
@@ -13585,7 +13590,7 @@
<context>
<name>EmailDialog</name>
<message>
- <location filename="../UI/EmailDialog.py" line="339"/>
+ <location filename="../UI/EmailDialog.ui" line="13"/>
<source>Send bug report</source>
<translation>Envoyer un rapport de bug</translation>
</message>
@@ -15027,12 +15032,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
<source>Host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
<source>Permission</source>
<translation type="unfinished"></translation>
</message>
@@ -15047,7 +15052,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
<source>Geolocation</source>
<translation type="unfinished"></translation>
</message>
@@ -16189,7 +16194,7 @@
<translation type="unfinished">Nom:</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
<source><no flash cookie selected></source>
<translation type="unfinished"></translation>
</message>
@@ -16199,7 +16204,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
<source>Origin:</source>
<translation type="unfinished"></translation>
</message>
@@ -16234,7 +16239,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
<source>Remove Cookie</source>
<translation type="unfinished"></translation>
</message>
@@ -16660,7 +16665,7 @@
<context>
<name>GreaseMonkeyAddScriptDialog</name>
<message>
- <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
+ <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
<source>GreaseMonkey Script Installation</source>
<translation type="unfinished"></translation>
</message>
@@ -21880,447 +21885,437 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
- <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="1876"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
- <source>Could not start the hg executable.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
<source>Reverting changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+ <source>Mercurial Bisect ({0})</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
+ <source>Preview changegroup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+ <source>Identifying project directory</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+ <source>Create .hgignore file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+ <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
- <source>Mercurial Bisect ({0})</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
- <source>Preview changegroup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
- <source>Identifying project directory</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
- <source>Create .hgignore file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
- <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
<source>Revert changes</source>
<translation type="unfinished">Revenir avant les modifications</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
<source>Current branch tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
<source>Cancelling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished">Signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<source>Delete Bookmark</source>
<translation type="unfinished">Supprimer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished">Selectionner le signet à supprimer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished">Supprimer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished">Renommer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished">Déplacer le signet Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
<source>Pull Bookmark</source>
<translation type="unfinished">Récuperer le signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished">Sélectionner le signet à récuperer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
<source>Push Bookmark</source>
<translation type="unfinished">Envoyer signet</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished">Sélectionner le signet à envoyer:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
<source>Re-Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
<source>Do you really want to re-merge these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
<source>Do you really want to re-merge the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
<source>Re-Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
<source>Marking as 'unresolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation type="unfinished"></translation>
</message>
@@ -22328,7 +22323,7 @@
<context>
<name>HgAddSubrepositoryDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
@@ -23414,7 +23409,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
<source>Resolved</source>
<translation type="unfinished"></translation>
</message>
@@ -23424,7 +23419,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
<source>Unresolved</source>
<translation type="unfinished"></translation>
</message>
@@ -24044,7 +24039,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
@@ -24235,12 +24230,12 @@
<context>
<name>HgHisteditCommitEditor</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
<source>Edit Commit Message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
<source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -24411,12 +24406,12 @@
<context>
<name>HgHisteditPlanEditor</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
<source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
<source>Edit Plan</source>
<translation type="unfinished"></translation>
</message>
@@ -24557,7 +24552,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
<source>Mercurial Log</source>
<translation type="unfinished"></translation>
</message>
@@ -24587,17 +24582,17 @@
<translation type="unfinished">Sélectionner le champ à filtrer</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
<source>Revision</source>
<translation type="unfinished">Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
<source>Author</source>
<translation type="unfinished">Auteur</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
<source>Message</source>
<translation type="unfinished">Message</translation>
</message>
@@ -28496,7 +28491,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
<source>Mercurial Status</source>
<translation type="unfinished"></translation>
</message>
@@ -28637,7 +28632,7 @@
<translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
<source>Commit</source>
<translation type="unfinished">Commit</translation>
</message>
@@ -28757,7 +28752,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
@@ -29474,22 +29469,22 @@
<context>
<name>HgUserConfigDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
<source>Delete Host Fingerprint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
<source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
<source>Edit User Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
<source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
<translation type="unfinished"></translation>
</message>
@@ -29797,20 +29792,43 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
<source>Fingerprint:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
<source>Enter the host fingerprint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
<source>Enter Fingerprint</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+ <source>Hash Type:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HgUtilities</name>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+ <source>The hg process finished with the exit code {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="103"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/>
+ <source>Could not start the hg executable.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Histedit</name>
@@ -29941,7 +29959,7 @@
<translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</translation>
</message>
<message>
- <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+ <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
<source>&Remove</source>
<translation type="unfinished">Supp&rimer</translation>
</message>
@@ -35809,92 +35827,92 @@
<translation>Boutons standards</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
<source>Abort</source>
<translation>Abandon</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
<source>Ignore</source>
<translation>Ignorer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
<source>Save all</source>
<translation>Tout enregistrer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
<source>Save</source>
<translation>Enregistrer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
<source>Discard</source>
<translation>Abondonner les modifications</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
<source>Yes to all</source>
<translation>Oui à tout</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
<source>Open</source>
<translation>Ouvrir</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
<source>Reset</source>
<translation>Réinitialiser</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
<source>No</source>
<translation>Non</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
<source>No to all</source>
<translation>Non à tout</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
<source>Retry</source>
<translation>Réessayer</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
<source>Restore defaults</source>
<translation>Restaurer les valeurs par défaut</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
<source>Yes</source>
<translation>Oui</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
@@ -37644,7 +37662,7 @@
<context>
<name>NoCacheHostsDialog</name>
<message>
- <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
+ <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
<source>Not Cached Hosts</source>
<translation type="unfinished"></translation>
</message>
@@ -37752,7 +37770,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
+ <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
<source>Visual Selection</source>
<translation type="unfinished"></translation>
</message>
@@ -38422,7 +38440,7 @@
<context>
<name>PasswordsDialog</name>
<message>
- <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
+ <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
<source>Saved Passwords</source>
<translation type="unfinished"></translation>
</message>
@@ -43266,7 +43284,7 @@
<translation>Executées</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
<source>Coverage</source>
<translation>Coverage</translation>
</message>
@@ -43316,7 +43334,7 @@
</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
<source>%v/%m Files</source>
<translation type="unfinished"></translation>
</message>
@@ -43344,7 +43362,7 @@
<translation>Effacer toutes les infos</translation>
</message>
<message>
- <location filename="../DataViews/PyProfileDialog.py" line="233"/>
+ <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
<source>Profile Results</source>
<translation>Résultats du profiling</translation>
</message>
@@ -47990,7 +48008,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
<source>Remove Filters</source>
<translation type="unfinished"></translation>
</message>
@@ -48000,7 +48018,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
<source>Remove Attributes</source>
<translation type="unfinished"></translation>
</message>
@@ -49468,7 +49486,7 @@
<context>
<name>SendRefererWhitelistDialog</name>
<message>
- <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
+ <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
<source>Send Referer Whitelist</source>
<translation type="unfinished"></translation>
</message>
@@ -50674,7 +50692,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Snapshot/SnapWidget.py" line="531"/>
+ <location filename="../Snapshot/SnapWidget.ui" line="20"/>
<source>eric6 Snapshot</source>
<translation type="unfinished"></translation>
</message>
@@ -53292,7 +53310,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
<source>Subversion Diff</source>
<translation>Subversion Diff</translation>
</message>
@@ -53569,12 +53587,12 @@
<translation>Log Subversion</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
<source>Revision</source>
<translation>Révision</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
<source>Author</source>
<translation>Auteur</translation>
</message>
@@ -53584,7 +53602,7 @@
<translation>Date</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
<source>Message</source>
<translation>Message</translation>
</message>
@@ -54071,7 +54089,7 @@
<translation>&Protocole:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL:</translation>
</message>
@@ -54182,7 +54200,7 @@
<translation>Sélectionner le protocole d'accès au référentiel</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL:</translation>
</message>
@@ -55481,7 +55499,7 @@
<translation>ignoré</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
<source>Subversion Status</source>
<translation>Status Subversion</translation>
</message>
@@ -55491,7 +55509,7 @@
<translation>Commit des changements dans le référentiel...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
<source>Commit</source>
<translation>Commit</translation>
</message>
@@ -60979,7 +60997,7 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+ <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
<source>Unittest</source>
<translation>Tests unitaires</translation>
</message>
@@ -71810,24 +71828,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Modifications</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
<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="2172"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
<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>
@@ -71836,23 +71854,23 @@
<tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
<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="2157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
<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="2177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
<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="2181"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
<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>
@@ -71863,12 +71881,12 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
<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="1538"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -71879,13 +71897,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
<source><tr><td><b>Head #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
