--- a/i18n/eric6_en.ts Mon Oct 24 19:55:05 2016 +0200 +++ b/i18n/eric6_en.ts Tue Oct 25 19:33:11 2016 +0200 @@ -23894,27 +23894,27 @@ <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> @@ -23965,12 +23965,12 @@ <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> <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> @@ -24005,7 +24005,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> @@ -24025,7 +24025,7 @@ <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> @@ -24075,12 +24075,12 @@ <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> @@ -24115,25 +24115,35 @@ <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="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> @@ -50737,7 +50747,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> @@ -50755,12 +50765,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> @@ -61935,167 +61945,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> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/Config.py" line="31"/> <source>Set</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Debugger/Config.py" line="32"/> + <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> <message> - <location filename="../Debugger/Config.py" line="32"/> + <location filename="../Debugger/Config.py" line="31"/> <source>Frozen Set</source> <translation type="unfinished"></translation> </message>