Added support for host fingerprints in the hostsecurity section of the Mercurial configuration file (as of hg 3.9.0).

Sun, 06 Nov 2016 17:02:45 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 06 Nov 2016 17:02:45 +0100
changeset 5292
ac8b476ba122
parent 5291
e93d14b48c34
child 5293
26f1e696a2a5

Added support for host fingerprints in the hostsecurity section of the Mercurial configuration file (as of hg 3.9.0).

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgUtilities.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/hg.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/APIs/Python3/eric6.api	Sun Nov 06 13:39:36 2016 +0100
+++ b/APIs/Python3/eric6.api	Sun Nov 06 17:02:45 2016 +0100
@@ -5011,10 +5011,16 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpEditButton_clicked?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.readUserConfig?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.writeUserConfig?4()
-eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog?1(version=(0, 0), parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog?1(version=(0, 0, 0), parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.fingerprintLength?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.getData?4()
-eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog?1(parent=None, host="", fingerprint="")
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.supportedHashes?7
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog?1(parent=None, host="", fingerprint="", version=(0, 0, 0))
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.hgVersion?4(plugin)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="")
 eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_accepted?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_rejected?4()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sun Nov 06 13:39:36 2016 +0100
+++ b/Documentation/Help/source.qhp	Sun Nov 06 17:02:45 2016 +0100
@@ -8077,7 +8077,9 @@
       <keyword name="HgUserConfigDialog" id="HgUserConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog" />
       <keyword name="HgUserConfigDialog (Constructor)" id="HgUserConfigDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__init__" />
       <keyword name="HgUserConfigDialog (Module)" id="HgUserConfigDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" />
+      <keyword name="HgUserConfigDialog.__assembleFingerprints" id="HgUserConfigDialog.__assembleFingerprints" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__assembleFingerprints" />
       <keyword name="HgUserConfigDialog.__clearDialog" id="HgUserConfigDialog.__clearDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearDialog" />
+      <keyword name="HgUserConfigDialog.__clearFingerprints" id="HgUserConfigDialog.__clearFingerprints" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearFingerprints" />
       <keyword name="HgUserConfigDialog.__finalizeFingerprintsColumns" id="HgUserConfigDialog.__finalizeFingerprintsColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__finalizeFingerprintsColumns" />
       <keyword name="HgUserConfigDialog.__updateFingerprintsButtons" id="HgUserConfigDialog.__updateFingerprintsButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__updateFingerprintsButtons" />
       <keyword name="HgUserConfigDialog.accept" id="HgUserConfigDialog.accept" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.accept" />
@@ -8092,7 +8094,11 @@
       <keyword name="HgUserConfigHostFingerprintDialog" id="HgUserConfigHostFingerprintDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog" />
       <keyword name="HgUserConfigHostFingerprintDialog (Constructor)" id="HgUserConfigHostFingerprintDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.__init__" />
       <keyword name="HgUserConfigHostFingerprintDialog (Module)" id="HgUserConfigHostFingerprintDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html" />
+      <keyword name="HgUserConfigHostFingerprintDialog.__updateOkButton" id="HgUserConfigHostFingerprintDialog.__updateOkButton" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.__updateOkButton" />
       <keyword name="HgUserConfigHostFingerprintDialog.getData" id="HgUserConfigHostFingerprintDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.getData" />
+      <keyword name="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" id="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" />
+      <keyword name="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" id="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" />
+      <keyword name="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" id="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" />
       <keyword name="HgUtilities (Module)" id="HgUtilities (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" />
       <keyword name="HighlightingStylesReader" id="HighlightingStylesReader" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader" />
       <keyword name="HighlightingStylesReader (Constructor)" id="HighlightingStylesReader (Constructor)" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader.__init__" />
@@ -16454,6 +16460,7 @@
       <keyword name="hashPassword" id="hashPassword" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPassword" />
       <keyword name="hashPasswordTuple" id="hashPasswordTuple" ref="eric6.Utilities.crypto.py3PBKDF2.html#hashPasswordTuple" />
       <keyword name="hg (Module)" id="hg (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html" />
+      <keyword name="hgVersion" id="hgVersion" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#hgVersion" />
       <keyword name="histedit (Module)" id="histedit (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.histedit.html" />
       <keyword name="html_encode" id="html_encode" ref="eric6.Utilities.__init__.html#html_encode" />
       <keyword name="html_udecode" id="html_udecode" ref="eric6.Utilities.__init__.html#html_udecode" />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html	Sun Nov 06 13:39:36 2016 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html	Sun Nov 06 17:02:45 2016 +0100
@@ -60,9 +60,15 @@
 <td><a href="#HgUserConfigDialog.__init__">HgUserConfigDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__assembleFingerprints">__assembleFingerprints</a></td>
+<td>Private method to assemble a list of host fingerprints.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.__clearDialog">__clearDialog</a></td>
 <td>Private method to clear the data of the dialog.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__clearFingerprints">__clearFingerprints</a></td>
+<td>Private method to clear the fingerprints from the hostsecurity section.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.__finalizeFingerprintsColumns">__finalizeFingerprintsColumns</a></td>
 <td>Private method to resize and sort the host fingerprints columns.</td>
 </tr><tr>
@@ -103,22 +109,42 @@
 </table>
 <a NAME="HgUserConfigDialog.__init__" ID="HgUserConfigDialog.__init__"></a>
 <h4>HgUserConfigDialog (Constructor)</h4>
-<b>HgUserConfigDialog</b>(<i>version=(0, 0), parent=None</i>)
+<b>HgUserConfigDialog</b>(<i>version=(0, 0, 0), parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>version</i></dt>
+<dt><i>version</i> (tuple of three integers)</dt>
+<dd>
+Mercurial version info
+</dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
-Mercurial version info (tuple of two integers)
-</dd><dt><i>parent</i></dt>
+reference to the parent widget
+</dd>
+</dl><a NAME="HgUserConfigDialog.__assembleFingerprints" ID="HgUserConfigDialog.__assembleFingerprints"></a>
+<h4>HgUserConfigDialog.__assembleFingerprints</h4>
+<b>__assembleFingerprints</b>(<i></i>)
+<p>
+        Private method to assemble a list of host fingerprints.
+</p><dl>
+<dt>Returns:</dt>
 <dd>
-reference to the parent widget (QWidget)
+dictionary with list of fingerprints per host
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+dict with str as key and list of str as value
 </dd>
 </dl><a NAME="HgUserConfigDialog.__clearDialog" ID="HgUserConfigDialog.__clearDialog"></a>
 <h4>HgUserConfigDialog.__clearDialog</h4>
 <b>__clearDialog</b>(<i></i>)
 <p>
         Private method to clear the data of the dialog.
+</p><a NAME="HgUserConfigDialog.__clearFingerprints" ID="HgUserConfigDialog.__clearFingerprints"></a>
+<h4>HgUserConfigDialog.__clearFingerprints</h4>
+<b>__clearFingerprints</b>(<i></i>)
+<p>
+        Private method to clear the fingerprints from the hostsecurity section.
 </p><a NAME="HgUserConfigDialog.__finalizeFingerprintsColumns" ID="HgUserConfigDialog.__finalizeFingerprintsColumns"></a>
 <h4>HgUserConfigDialog.__finalizeFingerprintsColumns</h4>
 <b>__finalizeFingerprintsColumns</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html	Sun Nov 06 13:39:36 2016 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html	Sun Nov 06 17:02:45 2016 +0100
@@ -48,7 +48,7 @@
 QDialog, Ui_HgUserConfigHostFingerprintDialog
 <h3>Class Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>fingerprintLength</td></tr><tr><td>supportedHashes</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -60,8 +60,20 @@
 <td><a href="#HgUserConfigHostFingerprintDialog.__init__">HgUserConfigHostFingerprintDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#HgUserConfigHostFingerprintDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private method to update the status of the Ok button.</td>
+</tr><tr>
 <td><a href="#HgUserConfigHostFingerprintDialog.getData">getData</a></td>
 <td>Public method to retrieve the data.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged">on_fingerprintEdit_textChanged</a></td>
+<td>Private slot to handle changes of the fingerprint edit.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged">on_hashComboBox_currentIndexChanged</a></td>
+<td>Private slot to handle changes of the hash combo.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged">on_hostEdit_textChanged</a></td>
+<td>Private slot to handle changes of the host edit.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -70,7 +82,7 @@
 </table>
 <a NAME="HgUserConfigHostFingerprintDialog.__init__" ID="HgUserConfigHostFingerprintDialog.__init__"></a>
 <h4>HgUserConfigHostFingerprintDialog (Constructor)</h4>
-<b>HgUserConfigHostFingerprintDialog</b>(<i>parent=None, host="", fingerprint=""</i>)
+<b>HgUserConfigHostFingerprintDialog</b>(<i>parent=None, host="", fingerprint="", version=(0, 0, 0)</i>)
 <p>
         Constructor
 </p><dl>
@@ -83,8 +95,16 @@
 </dd><dt><i>fingerprint</i> (str)</dt>
 <dd>
 fingerprint for the host
+</dd><dt><i>version</i> (tuple of three integers)</dt>
+<dd>
+Mercurial version info
 </dd>
-</dl><a NAME="HgUserConfigHostFingerprintDialog.getData" ID="HgUserConfigHostFingerprintDialog.getData"></a>
+</dl><a NAME="HgUserConfigHostFingerprintDialog.__updateOkButton" ID="HgUserConfigHostFingerprintDialog.__updateOkButton"></a>
+<h4>HgUserConfigHostFingerprintDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+<p>
+        Private method to update the status of the Ok button.
+</p><a NAME="HgUserConfigHostFingerprintDialog.getData" ID="HgUserConfigHostFingerprintDialog.getData"></a>
 <h4>HgUserConfigHostFingerprintDialog.getData</h4>
 <b>getData</b>(<i></i>)
 <p>
@@ -99,6 +119,36 @@
 <dd>
 tuple of two str
 </dd>
+</dl><a NAME="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" ID="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged"></a>
+<h4>HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged</h4>
+<b>on_fingerprintEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the fingerprint edit.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+current text
+</dd>
+</dl><a NAME="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" ID="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged"></a>
+<h4>HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged</h4>
+<b>on_hashComboBox_currentIndexChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the hash combo.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+current text
+</dd>
+</dl><a NAME="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" ID="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged"></a>
+<h4>HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged</h4>
+<b>on_hostEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the host edit.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+current text
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html	Sun Nov 06 13:39:36 2016 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html	Sun Nov 06 17:02:45 2016 +0100
@@ -37,6 +37,9 @@
 <td><a href="#getConfigPath">getConfigPath</a></td>
 <td>Public function to get the filename of the config file.</td>
 </tr><tr>
+<td><a href="#hgVersion">hgVersion</a></td>
+<td>Public method to determine the Mercurial version.</td>
+</tr><tr>
 <td><a href="#prepareProcess">prepareProcess</a></td>
 <td>Public function to prepare the given process.</td>
 </tr>
@@ -55,6 +58,30 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="hgVersion" ID="hgVersion"></a>
+<h2>hgVersion</h2>
+<b>hgVersion</b>(<i>plugin</i>)
+<p>
+    Public method to determine the Mercurial version.
+</p><dl>
+<dt><i>plugin</i> (VcsMercurialPlugin)</dt>
+<dd>
+reference to the plugin object
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the Mercurial version as a string and as a tuple
+        and an error message.
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of str, tuple of int and str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="prepareProcess" ID="prepareProcess"></a>
 <h2>prepareProcess</h2>
 <b>prepareProcess</b>(<i>proc, encoding="", language=""</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Sun Nov 06 13:39:36 2016 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Sun Nov 06 17:02:45 2016 +0100
@@ -1561,7 +1561,7 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-flag indicating the existance (boolean) and an error message
+flag indicating the existence (boolean) and an error message
             (string)
 </dd>
 </dl><a NAME="Hg.vcsExport" ID="Hg.vcsExport"></a>
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Sun Nov 06 17:02:45 2016 +0100
@@ -112,5 +112,7 @@
         Private slot to edit the (per user) Mercurial configuration file.
         """
         from ..HgUserConfigDialog import HgUserConfigDialog
-        dlg = HgUserConfigDialog()
+        from ..HgUtilities import hgVersion
+        
+        dlg = HgUserConfigDialog(version=hgVersion(self.__plugin)[1])
         dlg.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Sun Nov 06 17:02:45 2016 +0100
@@ -33,16 +33,20 @@
     """
     Class implementing a dialog to enter some user data.
     """
-    def __init__(self, version=(0, 0), parent=None):
+    def __init__(self, version=(0, 0, 0), parent=None):
         """
         Constructor
         
-        @param version Mercurial version info (tuple of two integers)
-        @param parent reference to the parent widget (QWidget)
+        @param version Mercurial version info
+        @type tuple of three integers
+        @param parent reference to the parent widget
+        @type QWidget
         """
         super(HgUserConfigDialog, self).__init__(parent)
         self.setupUi(self)
         
+        self.__version = version
+        
         self.lfUserCachePicker.setMode(E5PathPickerModes.DirectoryMode)
         if Globals.isLinuxPlatform():
             self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
@@ -178,27 +182,89 @@
         ###################################################################
         ## hostfingerprints section
         ###################################################################
-        if self.fingerprintsList.topLevelItemCount() > 0:
-            self.__config["hostfingerprints"] = {}
-            for row in range(self.fingerprintsList.topLevelItemCount()):
-                itm = self.fingerprintsList.topLevelItem(row)
-                self.__config["hostfingerprints"][itm.text(0)] = itm.text(1)
+        if self.__version < (3, 9, 0):
+            #
+            # delete hostsecurity section
+            #
+            if "hostsecurity" in self.__config:
+                del self.__config["hostsecurity"]
+            
+            #
+            # hostfingerprints section
+            #
+            if self.fingerprintsList.topLevelItemCount() > 0:
+                self.__config["hostfingerprints"] = {}
+                for row in range(self.fingerprintsList.topLevelItemCount()):
+                    itm = self.fingerprintsList.topLevelItem(row)
+                    self.__config["hostfingerprints"][itm.text(0)] = \
+                        itm.text(1)
+            else:
+                if "hostfingerprints" in self.__config:
+                    del self.__config["hostfingerprints"]
         else:
+            #
+            # delete hostfingerprints section
+            #
             if "hostfingerprints" in self.__config:
                 del self.__config["hostfingerprints"]
+            
+            #
+            # hostsecurity section
+            #
+            if self.fingerprintsList.topLevelItemCount() > 0:
+                if "hostsecurity" not in self.__config:
+                    self.__config["hostsecurity"] = {}
+                self.__clearFingerprints()
+                fingerprints = self.__assembleFingerprints()
+                for host in fingerprints:
+                    key = "{0}:fingerprints".format(host)
+                    self.__config["hostsecurity"][key] = \
+                        "\\\n" + ", \\\n".join(fingerprints[host])
+            else:
+                if "hostsecurity" in self.__config:
+                    self.__clearFingerprints()
+                    if len(self.__config.options("hostsecurity")) == 0:
+                        del self.__config["hostsecurity"]
         ###################################################################
         
         cfgFile = getConfigPath()
         with open(cfgFile, "w") as configFile:
             self.__config.write(configFile)
     
+    def __clearFingerprints(self):
+        """
+        Private method to clear the fingerprints from the hostsecurity section.
+        """
+        if "hostsecurity" in self.__config:
+            for key in self.__config.options("hostsecurity"):
+                if key.endswith(":fingerprints"):
+                    self.__config.remove_option("hostsecurity", key)
+    
+    def __assembleFingerprints(self):
+        """
+        Private method to assemble a list of host fingerprints.
+        
+        @return dictionary with list of fingerprints per host
+        @rtype dict with str as key and list of str as value
+        """
+        hostFingerprints = {}
+        for row in range(self.fingerprintsList.topLevelItemCount()):
+            itm = self.fingerprintsList.topLevelItem(row)
+            host = itm.text(0)
+            fingerprint = itm.text(1)
+            if host in hostFingerprints:
+                hostFingerprints[host].append(fingerprint)
+            else:
+                hostFingerprints[host] = [fingerprint]
+        return hostFingerprints
+    
     def readUserConfig(self):
         """
         Public method to read the user configuration file.
         """
         cfgFile = getConfigPath()
         
-        self.__config = E5ConfigParser()
+        self.__config = E5ConfigParser(delimiters=("=",))
         if self.__config.read(cfgFile):
             # step 1: extract user name and email
             try:
@@ -259,13 +325,34 @@
                     self.proxyBypassEdit.setText(
                         self.__config["http_proxy"]["no"])
             
-            # step 5: extract host fingerprints
+            # step 5a: extract host fingerprints
             if "hostfingerprints" in self.__config:
                 for host in self.__config.options("hostfingerprints"):
-                    QTreeWidgetItem(self.fingerprintsList, [
-                        host,
-                        self.__config["hostfingerprints"][host]
-                    ])
+                    if self.__version < (3, 9, 0):
+                        QTreeWidgetItem(self.fingerprintsList, [
+                            host,
+                            self.__config["hostfingerprints"][host]
+                        ])
+                    else:
+                        # convert to hostsecurity fingerprint
+                        QTreeWidgetItem(self.fingerprintsList, [
+                            host,
+                            "sha1:" + self.__config["hostfingerprints"][host]
+                        ])
+                self.__finalizeFingerprintsColumns()
+            
+            # step 5b: extract hostsecurity fingerprints
+            if "hostsecurity" in self.__config:
+                for key in self.__config.options("hostsecurity"):
+                    if key.endswith(":fingerprints"):
+                        host = key.replace(":fingerprints", "")
+                        fingerprints = \
+                            self.__config["hostsecurity"][key].split(",")
+                        for fingerprint in fingerprints:
+                            QTreeWidgetItem(self.fingerprintsList, [
+                                host,
+                                fingerprint.replace("\\", "").strip()
+                            ])
                 self.__finalizeFingerprintsColumns()
     
     @pyqtSlot()
@@ -325,7 +412,7 @@
         """
         Private slot to add a fingerprints entry.
         """
-        dlg = HgUserConfigHostFingerprintDialog(self)
+        dlg = HgUserConfigHostFingerprintDialog(self, version=self.__version)
         if dlg.exec_() == QDialog.Accepted:
             host, fingerprint = dlg.getData()
             itm = QTreeWidgetItem(self.fingerprintsList, [host, fingerprint])
@@ -360,7 +447,8 @@
         if itm is not None:
             host = itm.text(0)
             fingerprint = itm.text(1)
-            dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint)
+            dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint,
+                                                    version=self.__version)
             if dlg.exec_() == QDialog.Accepted:
                 host, fingerprint = dlg.getData()
                 itm.setText(0, host)
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Sun Nov 06 17:02:45 2016 +0100
@@ -9,7 +9,8 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtWidgets import QDialog
+from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox
 
 from .Ui_HgUserConfigHostFingerprintDialog import \
     Ui_HgUserConfigHostFingerprintDialog
@@ -20,7 +21,15 @@
     """
     Class implementing a dialog to edit a host fingerprint.
     """
-    def __init__(self, parent=None, host="", fingerprint=""):
+    supportedHashes = ("sha1", "sha256", "sha512")
+    fingerprintLength = {
+        "sha1": 40,
+        "sha256": 64,
+        "sha512": 128,
+    }
+    
+    def __init__(self, parent=None, host="", fingerprint="",
+                 version=(0, 0, 0)):
         """
         Constructor
         
@@ -30,12 +39,91 @@
         @type str
         @param fingerprint fingerprint for the host
         @type str
+        @param version Mercurial version info
+        @type tuple of three integers
         """
         super(HgUserConfigHostFingerprintDialog, self).__init__(parent)
         self.setupUi(self)
         
+        self.__version = version
+        
+        self.hashComboBox.addItem("")
+        self.hashComboBox.addItems(
+            HgUserConfigHostFingerprintDialog.supportedHashes)
+        if self.__version < (4, 9, 0):
+            self.hashLabel.setEnabled(False)
+            self.hashComboBox.setEnabled(False)
+            hash = "sha1"
+        else:
+            if fingerprint and fingerprint.startswith("sha"):
+                hash, fingerprint = fingerprint.split(":", 1)
+            else:
+                hash = ""
+        
+        index = self.hashComboBox.findText(hash)
+        self.hashComboBox.setCurrentIndex(index)
         self.hostEdit.setText(host)
         self.fingerprintEdit.setText(fingerprint)
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
+        
+        self.__updateOkButton()
+    
+    def __updateOkButton(self):
+        """
+        Private method to update the status of the Ok button.
+        """
+        enabled = (
+            bool(self.hostEdit.text()) and
+            bool(self.fingerprintEdit.text())
+        )
+        if self.__version >= (3, 9, 0):
+            hash = self.hashComboBox.currentText()
+            enabled &= bool(hash)
+            if hash:
+                enabled &= (
+                    len(self.fingerprintEdit.text().replace(":", "")) ==
+                    HgUserConfigHostFingerprintDialog.fingerprintLength[hash]
+                )
+        
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled)
+    
+    @pyqtSlot(str)
+    def on_hostEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the host edit.
+        
+        @param txt current text
+        @type str
+        """
+        self.__updateOkButton()
+    
+    @pyqtSlot(str)
+    def on_hashComboBox_currentIndexChanged(self, txt):
+        """
+        Private slot to handle changes of the hash combo.
+        
+        @param txt current text
+        @type str
+        """
+        self.__updateOkButton()
+    
+    @pyqtSlot(str)
+    def on_fingerprintEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the fingerprint edit.
+        
+        @param txt current text
+        @type str
+        """
+        if txt.startswith(tuple(
+            [h + ":" for h in
+             HgUserConfigHostFingerprintDialog.supportedHashes])):
+            parts = txt.split(":", 1)
+            if len(parts) == 2:
+                self.fingerprintEdit.setText(parts[1])
+        self.__updateOkButton()
     
     def getData(self):
         """
@@ -44,7 +132,12 @@
         @return tuple containig the host name and the fingerprint
         @rtype tuple of two str
         """
-        return (
-            self.hostEdit.text(),
-            self.fingerprintEdit.text(),
-        )
+        if self.__version < (3, 9, 0):
+            fingerprint = self.fingerprintEdit.text()
+        else:
+            fingerprint = "{0}:{1}".format(
+                self.hashComboBox.currentText(),
+                self.fingerprintEdit.text()
+            )
+        
+        return self.hostEdit.text(), fingerprint
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui	Sun Nov 06 17:02:45 2016 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>110</height>
+    <height>144</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -35,13 +35,44 @@
     </widget>
    </item>
    <item row="1" column="0">
+    <widget class="QLabel" name="hashLabel">
+     <property name="text">
+      <string>Hash Type:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QComboBox" name="hashComboBox">
+       <property name="currentText">
+        <string notr="true"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>178</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Fingerprint:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="E5ClearableLineEdit" name="fingerprintEdit">
      <property name="toolTip">
       <string>Enter the host fingerprint</string>
@@ -51,7 +82,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -70,6 +101,11 @@
    <header>E5Gui/E5LineEdit.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>hostEdit</tabstop>
+  <tabstop>hashComboBox</tabstop>
+  <tabstop>fingerprintEdit</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Nov 06 17:02:45 2016 +0100
@@ -10,8 +10,9 @@
 from __future__ import unicode_literals
 
 import os
+import re
 
-from PyQt5.QtCore import QProcessEnvironment
+from PyQt5.QtCore import QProcess, QProcessEnvironment, QCoreApplication
 
 import Utilities
 
@@ -50,3 +51,59 @@
         env.insert("LANGUAGE", language)
     
     proc.setProcessEnvironment(env)
+
+
+def hgVersion(plugin):
+    """
+    Public method to determine the Mercurial version.
+    
+    @param plugin reference to the plugin object
+    @type VcsMercurialPlugin
+    @return tuple containing the Mercurial version as a string and as a tuple
+        and an error message.
+    @rtype tuple of str, tuple of int and str
+    """
+    versionStr = ""
+    version = ()
+    errorMsg = ""
+    
+    
+    args = ["version"]
+    args.extend(plugin.getGlobalOptions())
+    process = QProcess()
+    process.start('hg', args)
+    procStarted = process.waitForStarted(5000)
+    if procStarted:
+        finished = process.waitForFinished(30000)
+        if finished and process.exitCode() == 0:
+            output = str(process.readAllStandardOutput(),
+                         plugin.getPreferences("Encoding"), 'replace')
+            versionStr = output.splitlines()[0].split()[-1][0:-1]
+            v = list(re.match(r'.*?(\d+)\.(\d+)\.?(\d+)?(\+[0-9a-f-]+)?',
+                              versionStr).groups())
+            if v[-1] is None:
+                del v[-1]
+            for i in range(3):
+                try:
+                    v[i] = int(v[i])
+                except TypeError:
+                    v[i] = 0
+                except IndexError:
+                    v.append(0)
+            version = tuple(v)
+        else:
+            if finished:
+                errorMsg = QCoreApplication.translate(
+                    "HgUtilities",
+                    "The hg process finished with the exit code {0}")\
+                    .format(process.exitCode())
+            else:
+                errorMsg = QCoreApplication.translate(
+                    "HgUtilities",
+                    "The hg process did not finish within 30s.")
+    else:
+        errorMsg = QCoreApplication.translate(
+            "HgUtilities",
+            "Could not start the hg executable.")
+    
+    return versionStr, version, errorMsg
--- a/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Sun Nov 06 17:02:45 2016 +0100
@@ -15,7 +15,6 @@
 from .Ui_HgHisteditConfigDialog import Ui_HgHisteditConfigDialog
 
 
-# TODO: Fix select button handling
 class HgHisteditConfigDialog(QDialog, Ui_HgHisteditConfigDialog):
     """
     Class implementing a dialog to enter the histedit parameters.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Nov 06 13:39:36 2016 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Nov 06 17:02:45 2016 +0100
@@ -15,7 +15,6 @@
 
 import os
 import shutil
-import re
 
 from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, \
     QCoreApplication
@@ -248,46 +247,16 @@
         """
         Public method used to test for the presence of the hg executable.
         
-        @return flag indicating the existance (boolean) and an error message
+        @return flag indicating the existence (boolean) and an error message
             (string)
         """
-        self.versionStr = ''
-        errMsg = ""
-        
-        args = self.initCommand("version")
-        process = QProcess()
-        process.start('hg', args)
-        procStarted = process.waitForStarted(5000)
-        if procStarted:
-            finished = process.waitForFinished(30000)
-            if finished and process.exitCode() == 0:
-                output = str(process.readAllStandardOutput(),
-                             self.getEncoding(), 'replace')
-                self.versionStr = output.splitlines()[0].split()[-1][0:-1]
-                v = list(re.match(r'.*?(\d+)\.(\d+)\.?(\d+)?(\+[0-9a-f-]+)?',
-                                  self.versionStr).groups())
-                for i in range(3):
-                    try:
-                        v[i] = int(v[i])
-                    except TypeError:
-                        v[i] = 0
-                    except IndexError:
-                        v.append(0)
-                self.version = tuple(v)
-                self.__getExtensionsInfo()
-                return True, errMsg
-            else:
-                if finished:
-                    errMsg = self.tr(
-                        "The hg process finished with the exit code {0}")\
-                        .format(process.exitCode())
-                else:
-                    errMsg = self.tr(
-                        "The hg process did not finish within 30s.")
-        else:
-            errMsg = self.tr("Could not start the hg executable.")
-        
-        return False, errMsg
+        from .HgUtilities import hgVersion
+        
+        self.versionStr, self.version, errMsg = hgVersion(self.__plugin)
+        hgExists = errMsg == ""
+        if hgExists:
+            self.__getExtensionsInfo()
+        return hgExists, errMsg
     
     def vcsInit(self, vcsDir, noDialog=False):
         """
--- a/i18n/eric6_cs.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_cs.ts	Sun Nov 06 17:02:45 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>Přidat záložku</translation>
     </message>
@@ -1777,7 +1777,7 @@
         <translation>Editovat &amp;adresu</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
         <source>&amp;Delete</source>
         <translation>&amp;Smazat</translation>
     </message>
@@ -2470,12 +2470,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>
@@ -2641,7 +2641,7 @@
         <translation>Stisknutím zrušit sdílený editor</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.py" line="513"/>
+        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
@@ -2939,7 +2939,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>
@@ -3295,37 +3295,37 @@
         <translation type="unfinished">Zpráva</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation type="unfinished">Zobrazit</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
@@ -3335,7 +3335,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation type="unfinished">Žádné problémy nenalezeny.</translation>
     </message>
@@ -3360,12 +3360,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3380,12 +3380,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation type="unfinished">Chyby</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3489,6 +3489,11 @@
         <source>&amp;Reset Defaults</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -4875,7 +4880,7 @@
         <translation type="unfinished">Doména:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7641,7 +7646,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>
@@ -8111,92 +8116,92 @@
         <translation type="unfinished">Standardní tlačítka</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">Přerušit</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">Použít</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">Zrušit</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">Zavřít</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">Zahodit</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">Ignorovat</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">Ne</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">Ne pro všechno</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">Ok</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">Otevřít</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">Obnovit defaulty</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">Vrátit</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">Uložit</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">Uložit vše</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">Ano</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">Ano pro všechno</translation>
     </message>
@@ -10206,7 +10211,7 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</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>Přidat z instalovaných API</translation>
     </message>
@@ -10216,7 +10221,7 @@
         <translation>Stiskněte pro kompilování vybrané API definici</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
         <source>Compile APIs</source>
         <translation>Kompilovat API</translation>
     </message>
@@ -10281,7 +10286,7 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</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>Přidat z API pluginů</translation>
     </message>
@@ -11295,7 +11300,7 @@
         <translation>Výběr výplně konce řádku.</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>Vyplnit do konce řádku</translation>
     </message>
@@ -11340,7 +11345,7 @@
         <translation>Vybrat font.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
         <source>Font</source>
         <translation></translation>
     </message>
@@ -12791,7 +12796,7 @@
         <translation>Mód:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
         <source>Disabled</source>
         <translation>Vypnuto</translation>
     </message>
@@ -13575,7 +13580,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>Odeslat hlášení o chybách</translation>
     </message>
@@ -15020,12 +15025,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>
@@ -15040,7 +15045,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>
@@ -16184,7 +16189,7 @@
         <translation type="unfinished">Jméno:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16194,7 +16199,7 @@
         <translation type="unfinished">Velikost:</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>
@@ -16229,7 +16234,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>
@@ -16655,7 +16660,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>
@@ -21916,445 +21921,445 @@
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
         <source>The hg process finished with the exit code {0}</source>
-        <translation>hg proces skončil s exit kódem {0}</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <translation type="obsolete">hg proces skončil s exit kódem {0}</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation>hg proces neskončil do 30s.</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
         <source>Could not start the hg executable.</source>
-        <translation>Nelze spustit hg program.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <translation type="obsolete">Nelze spustit hg program.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation>Vytvořit repozitář projektu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation>Úložiště projektu nelze vytvořit.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation>Vytváření Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation>Naklonovat projekt z Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation>Synchronizovat s Mercurial úložištěm</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation>Přidat soubory/složky do Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation>Odebrat soubory/složky z Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
         <source>Renaming {0}</source>
         <translation>Přejmenování {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
         <source>Reverting changes</source>
         <translation>Navrácení změn</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
         <source>Merging</source>
         <translation>Merging</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
         <source>Mercurial command</source>
         <translation>Mercurial příkaz</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
         <source>Copying {0}</source>
         <translation>Kopírování {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
         <source>Pulling from a remote Mercurial repository</source>
         <translation>Stažení (pull) z Mercurial repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
         <source>Pushing to a remote Mercurial repository</source>
         <translation>Odeslání (push) do Mercurial repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
         <source>Creating branch in the Mercurial repository</source>
         <translation>Vytvoření větve v Mercurial repozitáři</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
         <source>Verifying the integrity of the Mercurial repository</source>
         <translation>Ověřit integritu Mercurial repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
         <source>Showing the combined configuration settings</source>
         <translation>Zobrazení nastavení kombinovaných konfigurací</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
         <source>Showing aliases for remote repositories</source>
         <translation>Zobrazení aliasů pro vzdálené úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
         <source>Recovering from interrupted transaction</source>
         <translation>Obnovení z přerušené transakce</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
         <source>Shall the working directory be updated?</source>
         <translation>Má být pracovní adresář aktualizován?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
         <source>Showing current branch</source>
         <translation>Zobrazení aktuální větve</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
         <source>Create changegroup</source>
         <translation>Vytvořit skupinu změn</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
         <source>Apply changegroups</source>
         <translation>Použít skupinu změn</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
         <source>Bisect subcommand ({0}) invalid.</source>
         <translation>Neplatný bisect podpříkaz ({0}).</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+        <source>Mercurial Bisect ({0})</source>
+        <translation>Mercurial Bisect ({0})</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
+        <source>Preview changegroup</source>
+        <translation>Náhled skupiny změn</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+        <source>Identifying project directory</source>
+        <translation>Rozpoznat složku projektu</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>Create .hgignore file</source>
+        <translation>Vytvořit soubor .hgignore</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
-        <source>Mercurial Bisect ({0})</source>
-        <translation>Mercurial Bisect ({0})</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
-        <source>Preview changegroup</source>
-        <translation>Náhled skupiny změn</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
-        <source>Identifying project directory</source>
-        <translation>Rozpoznat složku projektu</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>Create .hgignore file</source>
-        <translation>Vytvořit soubor .hgignore</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
         <source>Removing files from the Mercurial repository only</source>
         <translation>Odebrat soubory jen z Mercurial úložiště</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
         <source>Mercurial Changegroup Files (*.hg)</source>
         <translation>Soubory Mercurial skupiny změn (*.hg)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
         <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
         <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
         <source>Backing out changeset</source>
         <translation>Zálohovat skupinu změn</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
         <source>No revision given. Aborting...</source>
         <translation>Nebyla dána žádná revize. Ruším...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
         <source>&lt;p&gt;The Mercurial changegroup file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
         <source>Rollback last transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
         <source>Are you sure you want to rollback the last transaction?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
         <source>Committing changes to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>Mercurial Command Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
         <source>Import Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Export Patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
         <source>Copy Changesets (Continue)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>Remove Sub-repositories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>Commit Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Revert changes</source>
         <translation type="unfinished">Vrátit změny</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
         <source>Do you really want to revert all changes to these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Do you really want to revert all changes of the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
         <source>Create Unversioned Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>Mercurial Side-by-Side Difference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
         <source>Tagging in the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
         <source>Created new branch &lt;{0}&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
         <source>Current branch tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
         <source>Cancelling uncommitted merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
         <source>Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Select the bookmark to be deleted:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
         <source>Delete Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
         <source>Rename Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
         <source>Move Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Pull Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Select the bookmark to be pulled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Push Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Select the bookmark to be push:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Re-Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
         <source>Do you really want to re-merge these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Do you really want to re-merge the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
         <source>Re-Merging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
         <source>Marking as &apos;unresolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
         <source>Marking as &apos;resolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>Delete All Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22362,7 +22367,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>
@@ -23447,7 +23452,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>
@@ -23457,7 +23462,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>
@@ -24081,7 +24086,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">Revize</translation>
     </message>
@@ -24272,12 +24277,12 @@
 <context>
     <name>HgHisteditCommitEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>Edit Commit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24448,12 +24453,12 @@
 <context>
     <name>HgHisteditPlanEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24594,7 +24599,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></translation>
     </message>
@@ -24624,17 +24629,17 @@
         <translation>Vybrat pole pro filtrování</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>Revize</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>Autor</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>Zpráva</translation>
     </message>
@@ -28536,7 +28541,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>Mercurial status</translation>
     </message>
@@ -28677,7 +28682,7 @@
         <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</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>Zapsat měny</translation>
     </message>
@@ -28797,7 +28802,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>
@@ -29527,22 +29532,22 @@
 <context>
     <name>HgUserConfigDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>Delete Host Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>Edit User Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29850,20 +29855,43 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
         <source>Fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
         <source>Enter the host fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
         <source>Enter Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <source>Hash Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HgUtilities</name>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+        <source>The hg process finished with the exit code {0}</source>
+        <translation type="unfinished">hg proces skončil s exit kódem {0}</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>Could not start the hg executable.</source>
+        <translation type="unfinished">Nelze spustit hg program.</translation>
+    </message>
 </context>
 <context>
     <name>Histedit</name>
@@ -29994,7 +30022,7 @@
         <translation>Stisknout pro odebrání vybraných položek</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
         <source>&amp;Remove</source>
         <translation>Odeb&amp;rat</translation>
     </message>
@@ -35873,92 +35901,92 @@
         <translation>Standardní tlačítka</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>Použít</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>Přerušit</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>Zrušit</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>Ignorovat</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>Uložit vše</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>Uložit</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>Zahodit</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>Ano pro všechno</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>Otevřít</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>Reset</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>Ok</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>Ne</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>Pomoc</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>Ne pro všechno</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>Vrátit</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>Obnovit defaulty</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>Ano</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>Zavřít</translation>
     </message>
@@ -37708,7 +37736,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>
@@ -37816,7 +37844,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>
@@ -38487,7 +38515,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>Uložená hesla</translation>
     </message>
@@ -43310,7 +43338,7 @@
         <translation>Vykonáno</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
         <source>Coverage</source>
         <translation>Pokrytí</translation>
     </message>
@@ -43391,7 +43419,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>
@@ -43399,7 +43427,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>Výsledky profilování</translation>
     </message>
@@ -48040,7 +48068,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>
@@ -48050,7 +48078,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>
@@ -49518,7 +49546,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>
@@ -50720,7 +50748,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>
@@ -53340,7 +53368,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></translation>
     </message>
@@ -53617,12 +53645,12 @@
         <translation></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>Revize</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>Autor</translation>
     </message>
@@ -53632,7 +53660,7 @@
         <translation>Datum</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>Zpráva</translation>
     </message>
@@ -54104,7 +54132,7 @@
         <translation>Prot&amp;otokol:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -54216,7 +54244,7 @@
         <translation>Výběr protokolu pro přístup do repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -55460,7 +55488,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></translation>
     </message>
@@ -55707,7 +55735,7 @@
         <translation>Chyba v procesu generování</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>Commit</translation>
     </message>
@@ -61017,7 +61045,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
         <source>Unittest</source>
         <translation></translation>
     </message>
@@ -71836,46 +71864,46 @@
 <context>
     <name>mercurial</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rodič #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Množina změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tagy&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Větve&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Poslední autor&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum zapsání změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Čas zapsání změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Množina změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Rodiče&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;
@@ -71883,12 +71911,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Poslední autor&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Datum zapsání změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;b&gt;Čas zapsání změn&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
         <source>&lt;h3&gt;Repository information&lt;/h3&gt;
 &lt;p&gt;&lt;table&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Mercurial V.&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
@@ -71899,13 +71927,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_de.ts	Sun Nov 06 17:02:45 2016 +0100
@@ -3235,37 +3235,37 @@
         <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation>PEP-257</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation>Eric</translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation>Eric</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation>Statistik...</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
@@ -3275,7 +3275,7 @@
         <translation>Lösung: {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation>Keine Probleme gefunden.</translation>
     </message>
@@ -3300,12 +3300,12 @@
         <translation>Ignorierte anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation>{0} (ignoriert)</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation>Bereite Dateien vor...</translation>
     </message>
@@ -3320,12 +3320,12 @@
         <translation>Gib die maximal erlaubte Codekomplexität ein (McCabe: 10)</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation>Übertrage Daten...</translation>
     </message>
@@ -3429,6 +3429,11 @@
         <source>&amp;Reset Defaults</source>
         <translation>Standards lösc&amp;hen</translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation>Keine Dateien gefunden (überprüfe die Ignorierliste).</translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -21399,447 +21404,437 @@
 <context>
     <name>Hg</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
-        <source>The hg process finished with the exit code {0}</source>
-        <translation>Der hg-Prozess endete mit dem Code {0}</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
-        <source>Could not start the hg executable.</source>
-        <translation>Das hg Programm konnte nicht gestartet werden.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation>Projektrepository anlegen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation>Das Projektrepository konnte nicht erzeugt werden.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation>Lege Mercurial-Repository an</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation>Erstes Commit für das Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation>Klone das Projekt aus dem Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation>Gleiche mit dem Mercurial-Repository ab</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
         <source>Renaming {0}</source>
         <translation>Benenne {0} um</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
         <source>Reverting changes</source>
         <translation>Mache Änderungen rückgängig</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
         <source>Merging</source>
         <translation>Zusammenführen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
         <source>Mercurial command</source>
         <translation>Mercurial-Befehl</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
         <source>Copying {0}</source>
         <translation>Kopiere {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
         <source>Pulling from a remote Mercurial repository</source>
         <translation>Pull von einem entfernten Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
         <source>Pushing to a remote Mercurial repository</source>
         <translation>Push in ein entferntes Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
         <source>Creating branch in the Mercurial repository</source>
         <translation>Erzeuge Zweig im Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
         <source>Verifying the integrity of the Mercurial repository</source>
         <translation>Verifiziere die Integrität des Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
         <source>Showing the combined configuration settings</source>
         <translation>Zeige die kombinierten Einstellungen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
         <source>Showing aliases for remote repositories</source>
         <translation>Zeige Namen für entfernte Repositorys</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
         <source>Recovering from interrupted transaction</source>
         <translation>Setze abgebrochene Transaktion zurück</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
         <source>Shall the working directory be updated?</source>
         <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
         <source>Showing current branch</source>
         <translation>Zeige aktuellen Zweig</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
         <source>Create changegroup</source>
         <translation>Änderungsgruppe erzeugen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
         <source>Apply changegroups</source>
         <translation>Änderungsgruppen anwenden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
         <source>Bisect subcommand ({0}) invalid.</source>
         <translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+        <source>Mercurial Bisect ({0})</source>
+        <translation>Mercurial-Bisect ({0})</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
+        <source>Preview changegroup</source>
+        <translation>Änderungsgruppe ansehen</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+        <source>Identifying project directory</source>
+        <translation>Projektverzeichnis identifizieren</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>Create .hgignore file</source>
+        <translation>.hgignore-Datei erstellen</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
-        <source>Mercurial Bisect ({0})</source>
-        <translation>Mercurial-Bisect ({0})</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
-        <source>Preview changegroup</source>
-        <translation>Änderungsgruppe ansehen</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
-        <source>Identifying project directory</source>
-        <translation>Projektverzeichnis identifizieren</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>Create .hgignore file</source>
-        <translation>.hgignore-Datei erstellen</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
         <source>Removing files from the Mercurial repository only</source>
         <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
         <source>Mercurial Changegroup Files (*.hg)</source>
         <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
         <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
         <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
         <source>Backing out changeset</source>
         <translation>Änderungssatz umkehren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
         <source>No revision given. Aborting...</source>
         <translation>Keine Revision angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
         <source>&lt;p&gt;The Mercurial changegroup file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Mercurial-Änderungsgruppendatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
         <source>Rollback last transaction</source>
         <translation>Letzte Transaktion zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
         <source>Are you sure you want to rollback the last transaction?</source>
         <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
         <source>Committing changes to Mercurial repository</source>
         <translation>Pflege Änderungen in das Mercurial-Repository ein</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>Mercurial Command Server</source>
         <translation>Mercurial-Befehlsserver</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Mercurial-Befehlsserver konnte nicht gestartet werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
         <source>Import Patch</source>
         <translation>Patch importieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Export Patches</source>
         <translation>Patches exportieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Change Phase</source>
         <translation>Phase ändern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
         <source>Copy Changesets</source>
         <translation>Änderungssätze kopieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
         <source>Copy Changesets (Continue)</source>
         <translation>Änderungssätze kopieren (Fortsetzung)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
         <source>Add Sub-repository</source>
         <translation>Unterrepository hinzufügen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag &lt;b&gt;{0}&lt;/b&gt;. Abbruch...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.&lt;/p&gt;&lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>Remove Sub-repositories</source>
         <translation>Unterrepositorys löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>Commit Changes</source>
         <translation>Änderungen einpflegen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
         <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Revert changes</source>
         <translation>Änderungen rückgängig</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
         <source>Do you really want to revert all changes to these files or directories?</source>
         <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Do you really want to revert all changes of the project?</source>
         <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
         <source>Create Unversioned Archive</source>
         <translation>Erzeuge nicht versioniertes Archiv</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>Mercurial Side-by-Side Difference</source>
         <translation>Mercurial Unterschiede nebeneinander anzeigen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
         <source>Tagging in the Mercurial repository</source>
         <translation>Marke im Mercurial-Repository setzen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
         <source>Created new branch &lt;{0}&gt;.</source>
         <translation>Neuer Zweig &lt;{0}&gt; wurde angelegt.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
         <source>Current branch tip</source>
         <translation>Spitze des aktuellen Zweigs</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
         <source>Cancelling uncommitted merge</source>
         <translation>Breche Zusammenführung ab</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
         <source>Mercurial Bookmark</source>
         <translation>Mercurial-Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Delete Bookmark</source>
         <translation>Lesezeichen löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Select the bookmark to be deleted:</source>
         <translation>Wähle das zu löschende Lesezeichen aus:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
         <source>Delete Mercurial Bookmark</source>
         <translation>Mercurial-Lesezeichen löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
         <source>Rename Mercurial Bookmark</source>
         <translation>Mercurial-Lesezeichen umbenennen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
         <source>Move Mercurial Bookmark</source>
         <translation>Mercurial-Lesezeichen verschieben</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Pull Bookmark</source>
         <translation>Lesezeichen herunterladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Select the bookmark to be pulled:</source>
         <translation>Wähle das herunterzuladende Lesezeichen:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Push Bookmark</source>
         <translation>Lesezeichen hochladen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Select the bookmark to be push:</source>
         <translation>Wähle das hochzuladende Lesezeichen:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Re-Merge</source>
         <translation>Neu zusammenführen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
         <source>Do you really want to re-merge these files or directories?</source>
         <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Do you really want to re-merge the project?</source>
         <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
         <source>Re-Merging</source>
         <translation>Neu zusammenführen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
         <source>Marking as &apos;unresolved&apos;</source>
         <translation>Markiere als &apos;nicht aufgelöst&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
         <source>Marking as &apos;resolved&apos;</source>
         <translation>Markiere als &apos;aufgelöst&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>Delete All Backups</source>
         <translation>Alle Backups löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Sollen wirklich alle Backupdateien des Backupbereiches &lt;b&gt;{0}&lt;/b&gt; gelöscht werden?&lt;/p&gt;</translation>
     </message>
@@ -23734,12 +23729,12 @@
 <context>
     <name>HgHisteditCommitEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>Edit Commit Message</source>
         <translation>Änderungsbeschreibung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -23910,7 +23905,7 @@
 <context>
     <name>HgHisteditPlanEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -28967,22 +28962,22 @@
 <context>
     <name>HgUserConfigDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>Delete Host Fingerprint</source>
         <translation>Fingerabdruck löschen</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soll der Fingerabdruck für den Host &lt;b&gt;{0}&lt;/b&gt; wirklich gelöscht werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>Edit User Configuration</source>
         <translation>Nutzerkonfiguration editieren</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
         <translation>Sie werden alle Änderungen, die in diesem Dialog vorgenommen wurden, verlieren. Sollen die Daten vorher gesichert werden?</translation>
     </message>
@@ -29290,20 +29285,43 @@
         <translation>Rechnernamen eingeben</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
         <source>Fingerprint:</source>
         <translation>Fingerabdruck:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
         <source>Enter the host fingerprint</source>
         <translation>Gib den Fingerabdruck des Rechners ein</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
         <source>Enter Fingerprint</source>
         <translation>Fingerabdruck eingeben</translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <source>Hash Type:</source>
+        <translation>Hashtyp:</translation>
+    </message>
+</context>
+<context>
+    <name>HgUtilities</name>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+        <source>The hg process finished with the exit code {0}</source>
+        <translation>Der hg-Prozess endete mit dem Code {0}</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="103"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/>
+        <source>Could not start the hg executable.</source>
+        <translation>Das hg Programm konnte nicht gestartet werden.</translation>
+    </message>
 </context>
 <context>
     <name>Histedit</name>
@@ -71022,24 +71040,24 @@
 <context>
     <name>mercurial</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Vorgänger #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Änderungssatz&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marken&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Zweige&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</source>
@@ -71048,24 +71066,24 @@
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed um&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Spitze&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Änderungssatz&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Vorgänger&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;
@@ -71076,12 +71094,12 @@
 &lt;/table&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Lesezeichen&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
         <source>&lt;h3&gt;Repository information&lt;/h3&gt;
 &lt;p&gt;&lt;table&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Mercurial V.&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
@@ -71092,14 +71110,14 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Kopf #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Vorgänger #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
--- a/i18n/eric6_empty.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_empty.ts	Sun Nov 06 17:02:45 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>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2389,12 +2389,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2497,7 +2497,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.py" line="513"/>
+        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2842,7 +2842,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
         <source>ClickToFlash Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3326,62 +3326,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3390,6 +3390,11 @@
         <source>Fix: {0}</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -4746,7 +4751,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7289,7 +7294,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
+        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7738,92 +7743,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
         <source>No to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
         <source>Restore defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
         <source>Save all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
         <source>Yes to all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9823,7 +9828,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/>
         <source>Add from installed APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9833,7 +9838,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/>
         <source>Add from Plugin APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9843,7 +9848,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
         <source>Compile APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10891,7 +10896,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10901,7 +10906,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
         <source>Fill to end of line</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12477,7 +12482,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13121,7 +13126,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.py" line="339"/>
+        <location filename="../UI/EmailDialog.ui" line="13"/>
         <source>Send bug report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14514,12 +14519,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
         <source>Permission</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14534,7 +14539,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
         <source>Geolocation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15654,7 +15659,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15664,7 +15669,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
         <source>Origin:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15699,7 +15704,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
         <source>Remove Cookie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16124,7 +16129,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>
@@ -21269,447 +21274,437 @@
 <context>
     <name>Hg</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
-        <source>The hg process finished with the exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
-        <source>Could not start the hg executable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>Commit Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
         <source>Committing changes to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
         <source>Renaming {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
         <source>Tagging in the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Revert changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
         <source>Do you really want to revert all changes to these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Do you really want to revert all changes of the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
         <source>Reverting changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
         <source>Merging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Re-Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
         <source>Do you really want to re-merge these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Do you really want to re-merge the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
         <source>Re-Merging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
         <source>Current branch tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
         <source>Mercurial command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
         <source>Copying {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
         <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/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>Mercurial Side-by-Side Difference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
         <source>Apply changegroups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
         <source>Pulling from a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
         <source>Pushing to a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
         <source>Marking as &apos;unresolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
         <source>Marking as &apos;resolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
         <source>Cancelling uncommitted merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
         <source>Creating branch in the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
         <source>Created new branch &lt;{0}&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
         <source>Showing current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
         <source>Verifying the integrity of the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
         <source>Showing the combined configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
         <source>Showing aliases for remote repositories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
         <source>Recovering from interrupted transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
         <source>Identifying project directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
         <source>Create .hgignore file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
         <source>Create changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
         <source>Mercurial Changegroup Files (*.hg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
         <source>&lt;p&gt;The Mercurial changegroup file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
         <source>Preview changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
         <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
         <source>Shall the working directory be updated?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
         <source>Bisect subcommand ({0}) invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+        <source>Mercurial Bisect ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
-        <source>Mercurial Bisect ({0})</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
         <source>Removing files from the Mercurial repository only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
         <source>Backing out changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
         <source>No revision given. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
         <source>Rollback last transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
         <source>Are you sure you want to rollback the last transaction?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
         <source>Import Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Export Patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
         <source>Copy Changesets (Continue)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
         <source>Create Unversioned Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>Remove Sub-repositories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>Mercurial Command Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
         <source>Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Select the bookmark to be deleted:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
         <source>Delete Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
         <source>Rename Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
         <source>Move Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Pull Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Select the bookmark to be pulled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Push Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Select the bookmark to be push:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>Delete All Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21717,7 +21712,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>
@@ -22802,7 +22797,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>
@@ -22812,7 +22807,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>
@@ -23389,7 +23384,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>
@@ -23580,12 +23575,12 @@
 <context>
     <name>HgHisteditCommitEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>Edit Commit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23756,12 +23751,12 @@
 <context>
     <name>HgHisteditPlanEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23902,7 +23897,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>
@@ -23972,7 +23967,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23982,7 +23977,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23992,7 +23987,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27810,7 +27805,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>
@@ -27831,7 +27826,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>
@@ -27916,7 +27911,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>
@@ -28780,22 +28775,22 @@
 <context>
     <name>HgUserConfigDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>Delete Host Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>Edit User Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29103,20 +29098,43 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
         <source>Fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
         <source>Enter the host fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
         <source>Enter Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <source>Hash Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HgUtilities</name>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+        <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>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Histedit</name>
@@ -29247,7 +29265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35109,92 +35127,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>
@@ -36869,7 +36887,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>
@@ -36977,7 +36995,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>
@@ -37647,7 +37665,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>
@@ -42386,7 +42404,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>
@@ -42417,7 +42435,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
+        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42472,7 +42490,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>
@@ -46989,7 +47007,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>
@@ -46999,7 +47017,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>
@@ -48472,7 +48490,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>
@@ -49461,7 +49479,7 @@
 <context>
     <name>SnapWidget</name>
     <message>
-        <location filename="../Snapshot/SnapWidget.py" line="531"/>
+        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
         <source>eric6 Snapshot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52148,7 +52166,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>
@@ -52450,17 +52468,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>
@@ -52896,7 +52914,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>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52989,7 +53007,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>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54210,7 +54228,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>
@@ -54231,7 +54249,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>
@@ -59667,7 +59685,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>
@@ -70415,35 +70433,35 @@
 <context>
     <name>mercurial</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
         <source>&lt;h3&gt;Repository information&lt;/h3&gt;
 &lt;p&gt;&lt;table&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Mercurial V.&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
@@ -70454,35 +70472,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
+        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
-        <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;
--- a/i18n/eric6_en.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_en.ts	Sun Nov 06 17:02:45 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>&amp;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>
@@ -3196,37 +3196,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,7 +3236,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3261,12 +3261,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3281,12 +3281,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3390,6 +3390,11 @@
         <source>&amp;Reset Defaults</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -4753,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>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7296,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>
@@ -7742,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>
@@ -9842,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>
@@ -9852,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>
@@ -9862,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>
@@ -10905,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>
@@ -10915,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>
@@ -12426,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>
@@ -13135,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>
@@ -14528,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>
@@ -14548,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>
@@ -15670,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>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15680,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>
@@ -15715,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>
@@ -16140,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>
@@ -21290,447 +21295,437 @@
 <context>
     <name>Hg</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
-        <source>The hg process finished with the exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
-        <source>Could not start the hg executable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
         <source>Renaming {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
         <source>Reverting changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
         <source>Merging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
         <source>Mercurial command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
         <source>Copying {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
         <source>Pulling from a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
         <source>Pushing to a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
         <source>Creating branch in the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
         <source>Showing current branch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
         <source>Verifying the integrity of the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
         <source>Showing the combined configuration settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
         <source>Showing aliases for remote repositories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
         <source>Recovering from interrupted transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
         <source>Identifying project directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
         <source>Create .hgignore file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
         <source>Create changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
         <source>Mercurial Changegroup Files (*.hg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
         <source>&lt;p&gt;The Mercurial changegroup file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
         <source>Preview changegroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
         <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
         <source>Apply changegroups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
         <source>Shall the working directory be updated?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
         <source>Bisect subcommand ({0}) invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+        <source>Mercurial Bisect ({0})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
-        <source>Mercurial Bisect ({0})</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
         <source>Removing files from the Mercurial repository only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
         <source>Backing out changeset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
         <source>No revision given. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
         <source>Rollback last transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
         <source>Are you sure you want to rollback the last transaction?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
         <source>Committing changes to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>Mercurial Command Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
         <source>Import Patch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Export Patches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Change Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
         <source>Copy Changesets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
         <source>Copy Changesets (Continue)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>Remove Sub-repositories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>Commit Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Revert changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
         <source>Do you really want to revert all changes to these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Do you really want to revert all changes of the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
         <source>Create Unversioned Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>Mercurial Side-by-Side Difference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
         <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/hg.py" line="1010"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
         <source>Tagging in the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
         <source>Created new branch &lt;{0}&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
         <source>Current branch tip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
         <source>Cancelling uncommitted merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
         <source>Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Delete Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Select the bookmark to be deleted:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
         <source>Delete Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
         <source>Rename Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
         <source>Move Mercurial Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Pull Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Select the bookmark to be pulled:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Push Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Select the bookmark to be push:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Re-Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
         <source>Do you really want to re-merge these files or directories?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Do you really want to re-merge the project?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
         <source>Re-Merging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
         <source>Marking as &apos;unresolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
         <source>Marking as &apos;resolved&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>Delete All Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21738,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>
@@ -22823,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>
@@ -22833,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>
@@ -23410,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>
@@ -23601,12 +23596,12 @@
 <context>
     <name>HgHisteditCommitEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>Edit Commit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23777,12 +23772,12 @@
 <context>
     <name>HgHisteditPlanEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23923,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>
@@ -23963,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>
@@ -27834,7 +27829,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>
@@ -27975,7 +27970,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>
@@ -28095,7 +28090,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>
@@ -28810,22 +28805,22 @@
 <context>
     <name>HgUserConfigDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>Delete Host Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>Edit User Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29133,20 +29128,43 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
         <source>Fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
         <source>Enter the host fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
         <source>Enter Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <source>Hash Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HgUtilities</name>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+        <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>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Histedit</name>
@@ -29277,7 +29295,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35132,92 +35150,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>
@@ -36907,7 +36925,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>
@@ -37015,7 +37033,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>
@@ -37685,7 +37703,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>
@@ -42425,7 +42443,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>
@@ -42504,7 +42522,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>
@@ -42512,7 +42530,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>
@@ -47039,7 +47057,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>
@@ -47049,7 +47067,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>
@@ -48512,7 +48530,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>
@@ -49712,7 +49730,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>
@@ -52189,7 +52207,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>
@@ -52491,17 +52509,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>
@@ -52953,7 +52971,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>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53045,7 +53063,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>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54251,7 +54269,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>
@@ -54527,7 +54545,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>
@@ -59708,7 +59726,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>
@@ -70459,46 +70477,46 @@
 <context>
     <name>mercurial</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;
@@ -70506,12 +70524,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
         <source>&lt;h3&gt;Repository information&lt;/h3&gt;
 &lt;p&gt;&lt;table&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Mercurial V.&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
@@ -70522,13 +70540,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation type="unfinished"></translation>
--- a/i18n/eric6_es.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_es.ts	Sun Nov 06 17:02:45 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>Añadir Marcador</translation>
     </message>
@@ -1704,7 +1704,7 @@
         <translation>Editar &amp;Dirección</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
@@ -2401,12 +2401,12 @@
         <translation>Pulsar para guardar el trazado de llamadas como archivo de texto</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
         <source>From</source>
         <translation>Desde</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
         <source>To</source>
         <translation>Hasta</translation>
     </message>
@@ -2572,7 +2572,7 @@
         <translation>Pulsar para cancelar la edición compartida</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.py" line="513"/>
+        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
@@ -2872,7 +2872,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>Lista Blanca de ClickToFlash</translation>
     </message>
@@ -3233,37 +3233,37 @@
         <translation>Mensaje</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation>Muestra el progreso de la comprobación del estilo de código</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation>Eric</translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation>Eric</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation>Estadísticas...</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation>Pulsar para mostrar algunas estadísticas de la última ejecución</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation>Pulsar para mostrar todos los archivos con algún problema</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation>Error: {0}</translation>
     </message>
@@ -3273,7 +3273,7 @@
         <translation>Arreglar: {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation>No se han encontrado problemas.</translation>
     </message>
@@ -3298,12 +3298,12 @@
         <translation>Mostrar ignorados</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation>{0} (ignorado)</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation>Preparando archivos...</translation>
     </message>
@@ -3318,12 +3318,12 @@
         <translation>Introducir la máxima complejidad de código permitida (McCabe: 10)</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation>Errores</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation>Transfiriendo datos...</translation>
     </message>
@@ -3427,6 +3427,11 @@
         <source>&amp;Reset Defaults</source>
         <translation>&amp;Restablecer Valores por Defecto</translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -4791,7 +4796,7 @@
         <translation>Dominio:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation>&lt;no hay cookie seleccionada&gt;</translation>
     </message>
@@ -7379,7 +7384,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>Descargas</translation>
     </message>
@@ -7838,92 +7843,92 @@
         <translation>Botones Estándar</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>Abortar</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>Aplicar</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>Cancelar</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>Cerrar</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>Descartar</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>Ayuda</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>Ignorar</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>No</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>No a todo</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>Ok</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>Abrir</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>Restaurar</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>Restaurar valores por defecto</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>Reintentar</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>Guardar</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>Guardar todo</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>Si</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>Si a todo</translation>
     </message>
@@ -9912,7 +9917,7 @@
         <translation>Presione para seleccionar un archivo API desde la lista de APIs instaladas</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>Añadir de las APIs instaladas</translation>
     </message>
@@ -9922,7 +9927,7 @@
         <translation>Pulse para compilar la definición de las APIs seleccionadas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
         <source>Compile APIs</source>
         <translation>Compilar APIs</translation>
     </message>
@@ -9977,7 +9982,7 @@
         <translation>Pulse para seleccionar un archivo de API de la lista de archivos de API instalados por los plugins</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>Añadir desde las APIs de plugins</translation>
     </message>
@@ -10986,7 +10991,7 @@
         <translation>Selecciona llenar hasta el fin de la línea.</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>Llenar hasta el final de la línea</translation>
     </message>
@@ -11031,7 +11036,7 @@
         <translation>Selección de Fuente.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
         <source>Font</source>
         <translation>Fuente</translation>
     </message>
@@ -12462,7 +12467,7 @@
         <translation>Modo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
@@ -13246,7 +13251,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>Enviar informe de bugs</translation>
     </message>
@@ -14642,12 +14647,12 @@
         <translation>Notificaciones</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
         <source>Permission</source>
         <translation>Permiso</translation>
     </message>
@@ -14662,7 +14667,7 @@
         <translation>Eliminar Todo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
         <source>Geolocation</source>
         <translation>Geolocalización</translation>
     </message>
@@ -15786,7 +15791,7 @@
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation>&lt;no hay cookie de flash seleccionada&gt;</translation>
     </message>
@@ -15796,7 +15801,7 @@
         <translation>Tamaño:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
         <source>Origin:</source>
         <translation>Origen:</translation>
     </message>
@@ -15831,7 +15836,7 @@
         <translation>Pulsar para eliminar las cookies de flash seleccionadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
         <source>Remove Cookie</source>
         <translation>Eliminar Cookie</translation>
     </message>
@@ -16259,7 +16264,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>Instalación de Script de GreaseMonkey</translation>
     </message>
@@ -21419,445 +21424,445 @@
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
         <source>The hg process finished with the exit code {0}</source>
-        <translation>El proceso hg ha terminado con código de salida {0}</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <translation type="obsolete">El proceso hg ha terminado con código de salida {0}</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation>El proceso hg no terminó en un plazo de 30s.</translation>
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
         <source>Could not start the hg executable.</source>
-        <translation>No se ha podido iniciar el ejecutable de hg.</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <translation type="obsolete">No se ha podido iniciar el ejecutable de hg.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation>Crear repositorio del proyecto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation>No se ha podido crear el repositorio del proyecto.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation>Creando repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation>Commit inicial al repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation>Clonando proyecto desde un repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation>Sincronizando con el repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation>Eliminando archivos/directorios del repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
         <source>Renaming {0}</source>
         <translation>Renombrando {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
         <source>Merging</source>
         <translation>Haciendo un merge</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
         <source>Copying {0}</source>
         <translation>Copiando {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
         <source>Pulling from a remote Mercurial repository</source>
         <translation>Haciendo pull de un repositorio remoto Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
         <source>Pushing to a remote Mercurial repository</source>
         <translation>Haciendo push a un repositorio remoto Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
         <source>Reverting changes</source>
         <translation>Revirtiendo cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
         <source>Mercurial command</source>
         <translation>Comando de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
         <source>Creating branch in the Mercurial repository</source>
         <translation>Creando branch en el repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
         <source>Verifying the integrity of the Mercurial repository</source>
         <translation>Verificando la integridad del repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
         <source>Showing the combined configuration settings</source>
         <translation>Mostrando los ajustes de configuración combinados</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
         <source>Showing aliases for remote repositories</source>
         <translation>Mostrando alias para repositorios remotos</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
         <source>Recovering from interrupted transaction</source>
         <translation>Recuperando de transacción interrumpida</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
         <source>Shall the working directory be updated?</source>
         <translation>¿Debe ser actualizado el directorio de trabajo?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
         <source>Showing current branch</source>
         <translation>Mostrando la branch actual</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
         <source>Create changegroup</source>
         <translation>Crear changegroup</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
         <source>Apply changegroups</source>
         <translation>Aplicar changegroups</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
         <source>Bisect subcommand ({0}) invalid.</source>
         <translation>Subcomando bisect ({0}) inválido.</translation>
     </message>
     <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+        <source>Mercurial Bisect ({0})</source>
+        <translation>Mercurial Bisect ({0})</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
+        <source>Preview changegroup</source>
+        <translation>Previsualizar changegroup</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+        <source>Identifying project directory</source>
+        <translation>Identificando directorio de proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>Create .hgignore file</source>
+        <translation>Crear archivo .hgignore</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
-        <source>Mercurial Bisect ({0})</source>
-        <translation>Mercurial Bisect ({0})</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
-        <source>Preview changegroup</source>
-        <translation>Previsualizar changegroup</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
-        <source>Identifying project directory</source>
-        <translation>Identificando directorio de proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>Create .hgignore file</source>
-        <translation>Crear archivo .hgignore</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; exists already. Overwrite it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
         <source>Removing files from the Mercurial repository only</source>
         <translation>Eliminando archivos unicamente del repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
         <source>Mercurial Changegroup Files (*.hg)</source>
         <translation>Archivos Changegroup de Mercurial (*.hg)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
         <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
         <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
         <source>Backing out changeset</source>
         <translation>Haciendo respaldo de changeset</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
         <source>No revision given. Aborting...</source>
         <translation>No se ha proporcionado revisión. Abortando...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
         <source>&lt;p&gt;The Mercurial changegroup file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo changegroup de Mercurial &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
         <source>Rollback last transaction</source>
         <translation>Hacer Rollback de la última transacción</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
         <source>Are you sure you want to rollback the last transaction?</source>
         <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
         <source>Committing changes to Mercurial repository</source>
         <translation>Haciendo commit de cambios al repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>Mercurial Command Server</source>
         <translation>Servidor de Comandos de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El Servidor de Comandos de Mercurial no ha podido reiniciarse.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El Servidor de Comandos de Mercurial no ha podido iniciarse.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
         <source>Import Patch</source>
         <translation>Importar Patch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Export Patches</source>
         <translation>Exportar Patches</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Change Phase</source>
         <translation>Cambiar Fase</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
         <source>Copy Changesets</source>
         <translation>Copiar Changesets</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
         <source>Copy Changesets (Continue)</source>
         <translation>Copiar Changesets (Continuar)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
         <source>Add Sub-repository</source>
         <translation>Añadir Sub-repositorio</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido leer el archivo .hgsub de sub-repositorios.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo .hgsub de sub-repositorios ya contiene una entrada.&lt;/p&gt;&lt;p&gt;Abortando...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido escribir al archivo .hgsub de sub-repositorios.&lt;/p&gt;&lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
         <source>Remove Sub-repositories</source>
         <translation>Eliminar Sub-repositorios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de subrepositorios .hgsub no existe. Abortando...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>Commit Changes</source>
         <translation>Hacer Commit de Cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
         <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
         <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Revert changes</source>
         <translation>Revertir cambios</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
         <source>Do you really want to revert all changes to these files or directories?</source>
         <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
         <source>Do you really want to revert all changes of the project?</source>
         <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
         <source>Create Unversioned Archive</source>
         <translation>Crear Archivo Sin Versionar</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>Mercurial Side-by-Side Difference</source>
         <translation>Diferencia Lado a Lado Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no se ha podido leer.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
         <source>Tagging in the Mercurial repository</source>
         <translation>Haciendo tag en el repositorio Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
         <source>Created new branch &lt;{0}&gt;.</source>
         <translation>Creada nueva branch &lt;{0}&gt;.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
         <source>Current branch tip</source>
         <translation>Tip branch actual</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
         <source>Cancelling uncommitted merge</source>
         <translation>Cancelando merge sin commit</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
         <source>Mercurial Bookmark</source>
         <translation>Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Delete Bookmark</source>
         <translation>Borrar Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
         <source>Select the bookmark to be deleted:</source>
         <translation>Seleccionar el marcador a borrar:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3678"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
         <source>Delete Mercurial Bookmark</source>
         <translation>Borrar Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
         <source>Rename Mercurial Bookmark</source>
         <translation>Renombrar Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
         <source>Move Mercurial Bookmark</source>
         <translation>Mover Marcador de Mercurial</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Pull Bookmark</source>
         <translation>Pull de Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
         <source>Select the bookmark to be pulled:</source>
         <translation>Seleccinar el marcador sobre el que hacer pull:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3842"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Push Bookmark</source>
         <translation>Push de Marcador</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
         <source>Select the bookmark to be push:</source>
         <translation>Seleccinar el marcador sobre el que hacer push:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3882"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Re-Merge</source>
         <translation>Re-Merge</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
         <source>Do you really want to re-merge these files or directories?</source>
         <translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
         <source>Do you really want to re-merge the project?</source>
         <translation>¿Desea realmente hacer un re-merge del proyecto?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
         <source>Re-Merging</source>
         <translation>Aplicando Re-Merge</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
         <source>Marking as &apos;unresolved&apos;</source>
         <translation>Marcando como &apos;unresolved&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
         <source>Marking as &apos;resolved&apos;</source>
         <translation>Marcando como &apos;resolved&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>Delete All Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21870,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>Añadir Sub-repositorio</translation>
     </message>
@@ -22958,7 +22963,7 @@
         <translation>Pulsar para marcar las entradas seleccionadas como &apos;resolved&apos;</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>Resolved</translation>
     </message>
@@ -22968,7 +22973,7 @@
         <translation>Pulsar para marcar las entradas seleccionadas como &apos;unresolved&apos;</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>Unresolved</translation>
     </message>
@@ -23561,7 +23566,7 @@
         <translation>Seleccionar la categoría sobre la que filtrar</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>Revisión</translation>
     </message>
@@ -23752,12 +23757,12 @@
 <context>
     <name>HgHisteditCommitEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>Edit Commit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser leído.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
@@ -23928,12 +23933,12 @@
 <context>
     <name>HgHisteditPlanEditor</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser leído.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24074,7 +24079,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>Registro de Mercurial</translation>
     </message>
@@ -24104,17 +24109,17 @@
         <translation>Seleccione el campo de filtrado</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>Revisión</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>Autor</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>Mensaje</translation>
     </message>
@@ -28005,7 +28010,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>Mercurial Status</translation>
     </message>
@@ -28147,7 +28152,7 @@
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</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>Commit</translation>
     </message>
@@ -28267,7 +28272,7 @@
         <translation>todo</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>Diferencias</translation>
     </message>
@@ -29130,22 +29135,22 @@
 <context>
     <name>HgUserConfigDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>Delete Host Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
         <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>Edit User Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
         <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29453,20 +29458,43 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
         <source>Fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
         <source>Enter the host fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
         <source>Enter Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+        <source>Hash Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HgUtilities</name>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+        <source>The hg process finished with the exit code {0}</source>
+        <translation type="unfinished">El proceso hg ha terminado con código de salida {0}</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">El proceso hg no terminó en un plazo de 30s.</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished">No se ha podido iniciar el ejecutable de hg.</translation>
+    </message>
 </context>
 <context>
     <name>Histedit</name>
@@ -29597,7 +29625,7 @@
         <translation>Pulse para eliminar las entradas seleccionadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
@@ -35416,92 +35444,92 @@
         <translation>Botones Estándar</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>Aplicar</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>Abortar</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>Cancelar</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>Ignorar</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>Guardar todo</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>Guardar</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>Descartar</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>Si a todo</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>Abrir</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>Reiniciar</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>Ok</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>No</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>Ayuda</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>No a todo</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>Reintentar</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>Restaurar valores por defecto</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>Si</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>Cerrar</translation>
     </message>
@@ -37231,7 +37259,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>Hosts no en Caché</translation>
     </message>
@@ -37339,7 +37367,7 @@
         <translation>Pulsar para seleccionar la posición visualmente, soltar para asignar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
         <source>Visual Selection</source>
         <translation>Selección Visual</translation>
     </message>
@@ -38012,7 +38040,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>Contraseñas Almacenadas</translation>
     </message>
@@ -42791,7 +42819,7 @@
         <translation>Ejecutadas</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
         <source>Coverage</source>
         <translation>Cobertura</translation>
     </message>
@@ -42871,7 +42899,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
+        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
         <source>%v/%m Files</source>
         <translation>%v/%m Archivos</translation>
     </message>
@@ -42879,7 +42907,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>Resultados de Profiling</translation>
     </message>
@@ -47548,7 +47576,7 @@
         <translation>Pulsar para eliminar los filtros seleccionados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
         <source>Remove Filters</source>
         <translation>Eliminar Filtros</translation>
     </message>
@@ -47558,7 +47586,7 @@
         <translation>Pulsar para eliminar los atributos seleccionados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
         <source>Remove Attributes</source>
         <translation>Eliminar Atributos</translation>
     </message>
@@ -49068,7 +49096,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>Enviar Lista Blanca de Referers</translation>
     </message>
@@ -50278,7 +50306,7 @@
         <translation>Copiar y Vista &amp;Preliminar</translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.py" line="531"/>
+        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
         <source>eric6 Snapshot</source>
         <translation>Captura de Pantalla de eric6</translation>
     </message>
@@ -52796,7 +52824,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>Diff de Subversion</translation>
     </message>
@@ -53099,17 +53127,17 @@
         <translation>Seleccione el campo de filtrado</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>Revisión</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>Autor</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>Mensaje</translation>
     </message>
@@ -53564,7 +53592,7 @@
         <translation>&amp;Protocolo:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -53664,7 +53692,7 @@
         <translation>Seleccionar el protocolo para acceder al repositorio</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -54874,7 +54902,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>Estado de Subversion</translation>
     </message>
@@ -55131,7 +55159,7 @@
         <translation>Error de Generación de Proceso</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>Commit</translation>
     </message>
@@ -60373,7 +60401,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
         <source>Unittest</source>
         <translation>Test Unitario</translation>
     </message>
@@ -71169,17 +71197,17 @@
 <context>
     <name>mercurial</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tags&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Etiquetas&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Branches&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;
@@ -71190,31 +71218,31 @@
 &lt;/table&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Tip&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Pista&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parents&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Padres&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Padre #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Changeset&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Last author&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed date&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{1}&lt;/td&gt;&lt;/tr&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Committed time&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</source>
@@ -71223,12 +71251,12 @@
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Hora de commit&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{2}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Bookmarks&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marcadores&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
         <source>&lt;h3&gt;Repository information&lt;/h3&gt;
 &lt;p&gt;&lt;table&gt;
 &lt;tr&gt;&lt;td&gt;&lt;b&gt;Mercurial V.&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;
@@ -71245,14 +71273,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Head #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
         <source>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
 </source>
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Parent #{0}&lt;/b&gt;&lt;/td&gt;&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;
--- a/i18n/eric6_fr.ts	Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_fr.ts	Sun Nov 06 17:02:45 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>Ajouter un signet</translation>
     </message>
@@ -1784,7 +1784,7 @@
         <translation>Éditer &amp;Adresse</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
@@ -2492,12 +2492,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">De</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
         <source>To</source>
         <translation type="unfinished">A</translation>
     </message>
@@ -2659,7 +2659,7 @@
         <translation>Cliquer pour annuler l&apos;éditeur partagé</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.py" line="513"/>
+        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
@@ -2955,7 +2955,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>
@@ -3312,37 +3312,37 @@
         <translation type="unfinished">Message</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
         <source>PEP-257</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
-        <source>Eric</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+        <source>Eric</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
         <source>Statistics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
         <source>Press to show some statistics for the last run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
         <source>Press to show all files containing an issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3352,7 +3352,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
         <source>No issues found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3377,12 +3377,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
         <source>{0} (ignored)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
         <source>Preparing files...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3397,12 +3397,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
         <source>Errors</source>
         <translation type="unfinished">Erreurs</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
         <source>Transferring data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3506,6 +3506,11 @@
         <source>&amp;Reset Defaults</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+        <source>No files found (check your ignore list).</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerPlugin</name>
@@ -4885,7 +4890,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7625,7 +7630,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>
@@ -8097,92 +8102,92 @@
         <translation type="unfinished">Boutons standards</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">Appliquer</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">Annuler</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">Fermer</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">Abondonner les modifications</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">Aide</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">Ignorer</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">Non</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">Non à tout</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">Ok</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">Ouvrir</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">Réinitialiser</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">Restaurer les valeurs par défaut</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">Réessayer</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">Tout enregistrer</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">Oui</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">Oui à tout</translation>
     </message>
@@ -10232,7 +10237,7 @@
         <translation>Cliquer pour sélectionner un fichier API à partir des fichiers installés</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>Ajouter à partir des APIs installés</translation>
     </message>
@@ -10242,7 +10247,7 @@
         <translation>Cliquer pour compiler les APIs sélectionnés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
         <source>Compile APIs</source>
         <translation>Compiler les APIs</translation>
     </message>
@@ -10267,7 +10272,7 @@
         <translation>Cliquer pour sélectionner un fichier API à partir de  la liste des APIs installés pour les plugins</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>Ajouter à partir des APIs de plugins</translation>
     </message>
@@ -11286,7 +11291,7 @@
         <translation>Cocher pour appliquer le style jusqu&apos;en fin de ligne.</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>Appliquer jusqu&apos;à la fin de ligne</translation>
     </message>
@@ -11331,7 +11336,7 @@
         <translation>Sélectionner la police.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
@@ -12798,7 +12803,7 @@
         <translation>Mode:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>
@@ -13585,7 +13590,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>Envoyer un rapport de bug</translation>
     </message>
@@ -15027,12 +15032,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>
@@ -15047,7 +15052,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>
@@ -16189,7 +16194,7 @@
         <translation type="unfinished">Nom:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16199,7 +16204,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>
@@ -16234,7 +16239,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>
@@ -16660,7 +16665,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>
@@ -21880,447 +21885,437 @@
 <context>
     <name>Hg</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
-        <source>The hg process finished with the exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
         <source>The hg process did not finish within 30s.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
-        <source>Could not start the hg executable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>Create project repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
         <source>The project repository could not be created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
         <source>Creating Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
         <source>Initial commit to Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
         <source>Cloning project from a Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
         <source>Synchronizing with the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
         <source>Adding files/directories to the Mercurial repository</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
         <source>Removing files/directories from the Mercurial repository</source>
         <translation type="unfinished">&