--- a/i18n/eric6_empty.ts Mon Oct 24 19:55:05 2016 +0200
+++ b/i18n/eric6_empty.ts Tue Oct 25 19:33:11 2016 +0200
@@ -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 type="unfinished"></translation>
</message>
@@ -1661,7 +1661,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+ <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
<source>&Delete</source>
<translation type="unfinished"></translation>
</message>
@@ -2389,12 +2389,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"></translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
<source>To</source>
<translation type="unfinished"></translation>
</message>
@@ -2497,7 +2497,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Cooperation/ChatWidget.py" line="513"/>
+ <location filename="../Cooperation/ChatWidget.ui" line="230"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
@@ -2842,7 +2842,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>
@@ -4746,7 +4746,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>
@@ -7289,7 +7289,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>
@@ -7738,92 +7738,92 @@
<translation type="unfinished"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></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"></translation>
</message>
@@ -9823,7 +9823,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -9833,7 +9833,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -9843,7 +9843,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
<source>Compile APIs</source>
<translation type="unfinished"></translation>
</message>
@@ -10891,7 +10891,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
<source>Font</source>
<translation type="unfinished"></translation>
</message>
@@ -10901,7 +10901,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -12477,7 +12477,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
@@ -13121,7 +13121,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 type="unfinished"></translation>
</message>
@@ -14514,12 +14514,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>
@@ -14534,7 +14534,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>
@@ -15654,7 +15654,7 @@
<translation type="unfinished"></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>
@@ -15664,7 +15664,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>
@@ -15699,7 +15699,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>
@@ -16124,7 +16124,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>
@@ -21707,7 +21707,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>
@@ -22792,7 +22792,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>
@@ -22802,7 +22802,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>
@@ -23379,7 +23379,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"></translation>
</message>
@@ -23658,7 +23658,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>
@@ -23728,7 +23728,7 @@
<translation type="unfinished"></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"></translation>
</message>
@@ -23738,7 +23738,7 @@
<translation type="unfinished"></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"></translation>
</message>
@@ -23748,7 +23748,7 @@
<translation type="unfinished"></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"></translation>
</message>
@@ -23983,7 +23983,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
@@ -24019,7 +24019,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -24049,70 +24049,80 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
<source>Push Selected Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/>
<source>Push changes of the selected changeset and its ancestors to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/>
- <source>Push All Changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="228"/>
+ <source>Push All Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/>
<source>Push all changes to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="641"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="644"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="647"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>Process Generation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958"/>
<source>{0} (large file)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>Find Commit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>'{0}' was not found.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/>
+ <source>Fetch Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/>
+ <source>Strip Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -27531,7 +27541,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>
@@ -27552,7 +27562,7 @@
<translation type="unfinished"></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"></translation>
</message>
@@ -27637,7 +27647,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>
@@ -28857,7 +28867,7 @@
<translation type="unfinished"></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"></translation>
</message>
@@ -34719,92 +34729,92 @@
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -36479,7 +36489,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>
@@ -36587,7 +36597,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>
@@ -37257,7 +37267,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>
@@ -41996,7 +42006,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
<source>Coverage</source>
<translation type="unfinished"></translation>
</message>
@@ -42027,7 +42037,7 @@
<translation type="unfinished"></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>
@@ -42082,7 +42092,7 @@
<context>
<name>PyProfileDialog</name>
<message>
- <location filename="../DataViews/PyProfileDialog.py" line="233"/>
+ <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
<source>Profile Results</source>
<translation type="unfinished"></translation>
</message>
@@ -46599,7 +46609,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>
@@ -46609,7 +46619,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>
@@ -48082,7 +48092,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>
@@ -49071,7 +49081,7 @@
<context>
<name>SnapWidget</name>
<message>
- <location filename="../Snapshot/SnapWidget.py" line="531"/>
+ <location filename="../Snapshot/SnapWidget.ui" line="20"/>
<source>eric6 Snapshot</source>
<translation type="unfinished"></translation>
</message>
@@ -50696,7 +50706,7 @@
<context>
<name>Strip</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="73"/>
<source>Stripping changesets from repository</source>
<translation type="unfinished"></translation>
</message>
@@ -50714,12 +50724,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>Strip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -51758,7 +51768,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 type="unfinished"></translation>
</message>
@@ -52060,17 +52070,17 @@
<translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -52506,7 +52516,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -52599,7 +52609,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -53820,7 +53830,7 @@
<context>
<name>SvnStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
<source>Subversion Status</source>
<translation type="unfinished"></translation>
</message>
@@ -53841,7 +53851,7 @@
<translation type="unfinished"></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 type="unfinished"></translation>
</message>
@@ -59277,7 +59287,7 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+ <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
<source>Unittest</source>
<translation type="unfinished"></translation>
</message>
@@ -61894,167 +61904,167 @@
<context>
<name>Variable Types</name>
<message>
+ <location filename="../Debugger/Config.py" line="16"/>
+ <source>Hidden Attributes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="17"/>
- <source>Hidden Attributes</source>
+ <source>None</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="18"/>
- <source>None</source>
+ <source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="19"/>
- <source>Type</source>
+ <source>Boolean</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="20"/>
- <source>Boolean</source>
+ <source>Integer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="21"/>
- <source>Integer</source>
+ <source>Long Integer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="22"/>
- <source>Long Integer</source>
+ <source>Float</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="23"/>
- <source>Float</source>
+ <source>Complex</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="24"/>
- <source>Complex</source>
+ <source>String</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="25"/>
- <source>String</source>
+ <source>Unicode String</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="26"/>
- <source>Unicode String</source>
+ <source>Tuple</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="27"/>
- <source>Tuple</source>
+ <source>List/Array</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="28"/>
- <source>List/Array</source>
+ <source>Dictionary/Hash/Map</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="29"/>
- <source>Dictionary/Hash/Map</source>
+ <source>Dictionary Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="30"/>
- <source>Dictionary Proxy</source>
+ <source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="31"/>
- <source>Set</source>
+ <source>Frozen Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="32"/>
- <source>Frozen Set</source>
+ <source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="33"/>
- <source>File</source>
+ <source>X Range</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="34"/>
- <source>X Range</source>
+ <source>Slice</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="35"/>
- <source>Slice</source>
+ <source>Buffer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="36"/>
- <source>Buffer</source>
+ <source>Class</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="37"/>
- <source>Class</source>
+ <source>Class Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="38"/>
- <source>Class Instance</source>
+ <source>Class Method</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="39"/>
- <source>Class Method</source>
+ <source>Class Property</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="40"/>
- <source>Class Property</source>
+ <source>Generator</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="41"/>
- <source>Generator</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="42"/>
<source>Function</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="43"/>
+ <source>Builtin Function</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="44"/>
- <source>Builtin Function</source>
+ <source>Code</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="45"/>
- <source>Code</source>
+ <source>Module</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="46"/>
- <source>Module</source>
+ <source>Ellipsis</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="47"/>
- <source>Ellipsis</source>
+ <source>Traceback</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="48"/>
- <source>Traceback</source>
+ <source>Frame</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="49"/>
- <source>Frame</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="50"/>
<source>Other</source>
<translation type="unfinished"></translation>
</message>
