diff -r 907f512c5246 -r 1ecd89554ddb i18n/eric6_empty.ts
--- a/i18n/eric6_empty.ts Mon Nov 07 19:00:32 2016 +0100
+++ b/i18n/eric6_empty.ts Mon Nov 07 19:22:23 2016 +0100
@@ -28775,22 +28775,22 @@
<context>
<name>HgUserConfigDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="459"/>
<source>Delete Host Fingerprint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="459"/>
<source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="515"/>
<source>Edit User Configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="515"/>
<source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
<translation type="unfinished"></translation>
</message>
@@ -28840,240 +28840,250 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="108"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="114"/>
<source>Select to activate the fetch extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="117"/>
<source>Fetch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="124"/>
<source>Select to activate the GPG extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="127"/>
<source>GPG</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="144"/>
<source>Select to activate the largefiles extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="212"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="210"/>
<source>Large Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="154"/>
<source>Select to activate the Purge extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="157"/>
<source>Purge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="164"/>
<source>Select to activate the queues extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="167"/>
<source>Queues</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="174"/>
<source>Select to activate the rebase extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="177"/>
<source>Rebase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="184"/>
<source>Select to activate the shelve extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="187"/>
<source>Shelve</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="218"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/>
<source>Minimum file size:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="225"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="223"/>
<source>Enter the minimum file size in MB for files to be treated as Large Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="231"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="229"/>
<source> MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="257"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="255"/>
<source>Patterns:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="264"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="262"/>
<source>Enter file patterns (space separated) for files to be treated as Large Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="265"/>
<source>Enter file patterns for large files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="272"/>
<source>User Cache:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="290"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="288"/>
<source>Enter the name of the user cache directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="314"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="312"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="332"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="330"/>
<source>Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="338"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="336"/>
<source>Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="345"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="343"/>
<source>Enter the network proxy host name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="346"/>
<source>Enter Proxy Hostname</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="353"/>
<source>User:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="362"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="360"/>
<source>Enter the user name for the network proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="363"/>
<source>Enter Proxy Username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="370"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="379"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="377"/>
<source>Enter the password for the network proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="383"/>
<source>Enter Proxy Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="390"/>
<source>Bypass:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="397"/>
<source>Enter the names of hosts bypassing the network proxy sparated by comma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="403"/>
<source>Enter hosts bypassing the proxy separated by comma</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="413"/>
<source>Host Fingerprints</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="432"/>
<source>Host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="437"/>
<source>Fingerprint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="447"/>
<source>Add a host fingerprint entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="456"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="454"/>
<source>Delete a host fingerprint entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="463"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="461"/>
<source>Edit a host fingerprint entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="490"/>
<source>Open the user configuration file in a text editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="493"/>
<source>Open configuration file in editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="194"/>
<source>Select to activate the strip extension</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="197"/>
<source>Strip</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="134"/>
+ <source>Select to activate the histedit extension</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="137"/>
+ <source>Histedit</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgUserConfigHostFingerprintDialog</name>
@@ -29121,17 +29131,17 @@
<context>
<name>HgUtilities</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="102"/>
<source>The hg process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="103"/>
- <source>The hg process did not finish within 30s.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="111"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
