Mercurial Repositories > eric / changeset
changeset
Little enhancement to the Mercurial log browser diff pane.
Sun, 12 Feb 2017 19:01:03 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 12 Feb 2017 19:01:03 +0100
- changeset 5518
- 2c5a6446980a
- parent 5517
- 805b36a7ffb7
- child 5519
- ab19452732df
Little enhancement to the Mercurial log browser diff pane.
| Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py | file | annotate | diff | comparison | revisions | |
| i18n/eric6_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_empty.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_en.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_pt.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_zh_CN.ts | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Feb 12 18:10:27 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Feb 12 19:01:03 2017 +0100 @@ -2548,7 +2548,7 @@ @param parent number of parent to diff against @type int """ - self.diffEdit.clear() + self.diffEdit.setPlainText(self.tr("Generating differences ...")) self.diffLabel.setText(self.tr("Differences")) self.diffSelectLabel.clear()
--- a/i18n/eric6_cs.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_cs.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25538,6 +25538,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric6_de.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_de.ts Sun Feb 12 19:01:03 2017 +0100 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1937,8 +1938,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="163"/> @@ -1947,8 +1948,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="169"/> @@ -2036,8 +2037,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="88"/> @@ -2046,8 +2047,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New Tab Ctrl+LMB</source> + <translation>In neuem Register öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="94"/> @@ -16985,8 +16986,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1218"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1291"/> @@ -24946,6 +24947,11 @@ <source><a href="save:me">Save</a></source> <translation><a href="save:me">Speichern</a></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation>Erzeuge Unterschiede ...</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -69157,8 +69163,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="551"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="555"/>
--- a/i18n/eric6_empty.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_empty.ts Sun Feb 12 19:01:03 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> <source>Add Bookmark</source> <translation type="unfinished"></translation> </message> @@ -1681,7 +1681,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -2409,12 +2409,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="109"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>From</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.ui" line="114"/> + <location filename="../Debugger/CallTraceViewer.py" line="54"/> <source>To</source> <translation type="unfinished"></translation> </message> @@ -2517,7 +2517,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.py" line="513"/> <source>Clear</source> <translation type="unfinished"></translation> </message> @@ -2862,7 +2862,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> @@ -4771,7 +4771,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7314,7 +7314,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> + <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> @@ -7763,92 +7763,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> @@ -9848,7 +9848,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> <source>Add from installed APIs</source> <translation type="unfinished"></translation> </message> @@ -9858,7 +9858,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> <source>Add from Plugin APIs</source> <translation type="unfinished"></translation> </message> @@ -9868,7 +9868,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> <source>Compile APIs</source> <translation type="unfinished"></translation> </message> @@ -11009,7 +11009,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> <source>Font</source> <translation type="unfinished"></translation> </message> @@ -11019,7 +11019,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> @@ -12615,7 +12615,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -13269,7 +13269,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.ui" line="13"/> + <location filename="../UI/EmailDialog.py" line="346"/> <source>Send bug report</source> <translation type="unfinished"></translation> </message> @@ -14687,12 +14687,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> <source>Permission</source> <translation type="unfinished"></translation> </message> @@ -14707,7 +14707,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> <source>Geolocation</source> <translation type="unfinished"></translation> </message> @@ -15827,7 +15827,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -15837,7 +15837,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> @@ -15872,7 +15872,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> @@ -16297,7 +16297,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> <source>GreaseMonkey Script Installation</source> <translation type="unfinished"></translation> </message> @@ -21880,7 +21880,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> @@ -23055,7 +23055,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -23065,7 +23065,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -23642,7 +23642,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24014,7 +24014,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -24155,7 +24155,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -24225,7 +24225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24235,7 +24235,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -24245,7 +24245,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -24747,7 +24747,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -24791,6 +24791,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -28010,7 +28015,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="316"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -28031,7 +28036,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="714"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -28116,7 +28121,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="860"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -29530,7 +29535,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> + <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> @@ -35674,92 +35679,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -37444,7 +37449,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> <source>Not Cached Hosts</source> <translation type="unfinished"></translation> </message> @@ -37552,7 +37557,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> <source>Visual Selection</source> <translation type="unfinished"></translation> </message> @@ -38222,7 +38227,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -42971,7 +42976,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> + <location filename="../DataViews/PyCoverageDialog.py" line="349"/> <source>Coverage</source> <translation type="unfinished"></translation> </message> @@ -43002,7 +43007,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> + <location filename="../DataViews/PyCoverageDialog.py" line="345"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -43057,7 +43062,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.ui" line="20"/> + <location filename="../DataViews/PyProfileDialog.py" line="233"/> <source>Profile Results</source> <translation type="unfinished"></translation> </message> @@ -47619,7 +47624,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> <source>Remove Filters</source> <translation type="unfinished"></translation> </message> @@ -47629,7 +47634,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> <source>Remove Attributes</source> <translation type="unfinished"></translation> </message> @@ -49115,7 +49120,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -50104,7 +50109,7 @@ <context> <name>SnapWidget</name> <message> - <location filename="../Snapshot/SnapWidget.ui" line="20"/> + <location filename="../Snapshot/SnapWidget.py" line="531"/> <source>eric6 Snapshot</source> <translation type="unfinished"></translation> </message> @@ -52874,7 +52879,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> <source>Subversion Diff</source> <translation type="unfinished"></translation> </message> @@ -53176,17 +53181,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -53497,7 +53502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -53590,7 +53595,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -54786,7 +54791,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> <source>Subversion Status</source> <translation type="unfinished"></translation> </message> @@ -54807,7 +54812,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -60243,7 +60248,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="14"/> + <location filename="../PyUnit/UnittestDialog.py" line="403"/> <source>Unittest</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_en.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_en.ts Sun Feb 12 19:01:03 2017 +0100 @@ -24812,6 +24812,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric6_es.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_es.ts Sun Feb 12 19:01:03 2017 +0100 @@ -24990,6 +24990,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric6_fr.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_fr.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25466,6 +25466,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric6_it.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_it.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25717,6 +25717,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric6_pt.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_pt.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25704,6 +25704,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric6_ru.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_ru.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25053,6 +25053,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name>
--- a/i18n/eric6_tr.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_tr.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25474,6 +25474,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
--- a/i18n/eric6_zh_CN.ts Sun Feb 12 18:10:27 2017 +0100 +++ b/i18n/eric6_zh_CN.ts Sun Feb 12 19:01:03 2017 +0100 @@ -25472,6 +25472,11 @@ <source><a href="save:me">Save</a></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/> + <source>Generating differences ...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name>
