--- a/i18n/eric6_en.ts Mon Nov 14 19:24:11 2016 +0100 +++ b/i18n/eric6_en.ts Mon Nov 14 19:58:22 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 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> @@ -2379,12 +2379,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> @@ -2492,7 +2492,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> @@ -4758,7 +4758,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> @@ -7301,7 +7301,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> @@ -7747,92 +7747,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> @@ -9847,7 +9847,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> @@ -9857,7 +9857,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> @@ -9867,7 +9867,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> @@ -10910,7 +10910,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> @@ -10920,7 +10920,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> @@ -12431,7 +12431,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> @@ -13140,7 +13140,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> @@ -14533,12 +14533,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> @@ -14553,7 +14553,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> @@ -15675,7 +15675,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> @@ -15685,7 +15685,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> @@ -15720,7 +15720,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> @@ -16145,7 +16145,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> @@ -21630,62 +21630,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3654"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3683"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3753"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3827"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3845"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3827"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3845"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3856"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3878"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3896"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -21733,7 +21733,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> @@ -22442,27 +22442,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="144"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="144"/> <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/HgBookmarksListDialog.py" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="183"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="46"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="44"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="48"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> @@ -22818,7 +22818,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> @@ -22828,7 +22828,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> @@ -23405,7 +23405,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> @@ -23777,7 +23777,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -23918,7 +23918,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> @@ -23958,17 +23958,17 @@ <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> <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> <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> @@ -24133,27 +24133,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="657"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="660"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="663"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="884"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="884"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -24188,28 +24188,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/> <source>Change the phase of the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="195"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="191"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1712"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1889"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -24229,42 +24229,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="188"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="202"/> <source>Tag the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1749"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="228"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="974"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -24314,12 +24314,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1990"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1990"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -24344,55 +24344,95 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="224"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="237"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> <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="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="244"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1828"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1889"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1768"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1829"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="251"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="211"/> + <source>Define Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/> + <source>Move bookmark to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1770"/> + <source>Define Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1770"/> + <source>Enter bookmark name for changeset "{0}":</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1792"/> + <source>Move Bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1792"/> + <source>Select the bookmark to be moved to changeset "{0}":</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -27829,7 +27869,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> @@ -27970,7 +28010,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> @@ -28090,7 +28130,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> @@ -29345,7 +29385,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> @@ -35200,92 +35240,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> @@ -36975,7 +37015,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> @@ -37083,7 +37123,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> @@ -37753,7 +37793,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> @@ -42493,7 +42533,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> @@ -42572,7 +42612,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> @@ -42580,7 +42620,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> @@ -47107,7 +47147,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> @@ -47117,7 +47157,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> @@ -48580,7 +48620,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> @@ -49780,7 +49820,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> @@ -52257,7 +52297,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> @@ -52559,17 +52599,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> @@ -53021,7 +53061,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> @@ -53113,7 +53153,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> @@ -54319,7 +54359,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> @@ -54595,7 +54635,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> @@ -59776,7 +59816,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>