Mercurial Repositories > eric / changeset
changeset
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).
--- 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()
--- 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 &adresu</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&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>&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><no cookie selected></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><no flash cookie selected></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></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 <{0}>.</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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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>&Remove</source> <translation>Odeb&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&otokol:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&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>&URL:</source> <translation>&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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71883,12 +71911,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></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><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -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><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- 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>&Reset Defaults</source> <translation>Standards lösc&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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></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><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></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 <{0}>.</source> <translation>Neuer Zweig <{0}> 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 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Soll der Fingerabdruck für den Host <b>{0}</b> wirklich gelöscht werden?</p></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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71048,24 +71066,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71076,12 +71094,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -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><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
--- 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>&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><no cookie selected></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><no flash cookie selected></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><p>The file <b>{0}</b> could not be read.</p></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 'unresolved'</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 'resolved'</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 <{0}>.</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><p>The file <b>{0}</b> exists already. Overwrite it?</p></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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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>&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>&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>&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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></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><tr><td><b>Tags</b></td><td>{0}</td></tr></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><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></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><tr><td><b>Branches</b></td><td>{0}</td></tr></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><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></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><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -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><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> + <source><tr><td><b>Parent #{0}</b></td><td></td></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> + <source><tr><td><b>Tip</b></td><td></td></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> - <source><tr><td><b>Parent #{0}</b></td><td></td></tr> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> - <source><tr><td><b>Tip</b></td><td></td></tr> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> - <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- 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>&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>&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><no cookie selected></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><no flash cookie selected></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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><p>The file <b>{0}</b> could not be read.</p></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 <{0}>.</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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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>&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>&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>&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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></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><tr><td><b>Tags</b></td><td>{0}</td></tr></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><tr><td><b>Branches</b></td><td>{0}</td></tr></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><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></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><tr><td><b>Tip</b></td><td></td></tr> </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><tr><td><b>Changeset</b></td><td>{0}</td></tr></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><tr><td><b>Parents</b></td><td>{0}</td></tr></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><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -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><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></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><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -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><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </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 &Dirección</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&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>&Reset Defaults</source> <translation>&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><no cookie selected></source> <translation><no hay cookie seleccionada></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><no flash cookie selected></source> <translation><no hay cookie de flash seleccionada></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></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><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></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 <{0}>.</source> <translation>Creada nueva branch <{0}>.</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 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></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 'resolved'</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 'unresolved'</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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>El archivo<b>{0}</b> no puede ser leído.<br />Causa: {1}</p></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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>El archivo<b>{0}</b> no puede ser leído.<br />Causa: {1}</p></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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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>&Remove</source> <translation>&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 &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>&Protocolo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&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>&URL:</source> <translation>&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><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71190,31 +71218,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71223,12 +71251,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -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><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
--- 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 &Adresse</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&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'é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>&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><no cookie selected></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'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'à 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><no flash cookie selected></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"></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">Revenir avant les modifications</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="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="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="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="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="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="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="2631"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="2519"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></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="2663"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></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="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="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="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="2616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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">Revenir avant les modifications</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><p>The file <b>{0}</b> could not be read.</p></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">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</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 <{0}>.</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">Signet 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 type="unfinished">Supprimer le signet</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">Selectionner le signet à supprimer:</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">Supprimer le signet 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 type="unfinished">Renommer le signet 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 type="unfinished">Déplacer le signet 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 type="unfinished">Récuperer le signet</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">Sélectionner le signet à récuperer:</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">Récupérant le signet d'un dépôt Mercurial distant</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">Envoyer signet</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">Sélectionner le signet à envoyer:</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">À envoyer le signet à un dépôt Mercurial distant</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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22328,7 +22323,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> @@ -23414,7 +23409,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> @@ -23424,7 +23419,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> @@ -24044,7 +24039,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">Révision</translation> </message> @@ -24235,12 +24230,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -24411,12 +24406,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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> @@ -24557,7 +24552,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> @@ -24587,17 +24582,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</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">Révision</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">Auteur</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">Message</translation> </message> @@ -28496,7 +28491,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> @@ -28637,7 +28632,7 @@ <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</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">Commit</translation> </message> @@ -28757,7 +28752,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> @@ -29474,22 +29469,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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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> @@ -29797,20 +29792,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> @@ -29941,7 +29959,7 @@ <translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation type="unfinished">Supp&rimer</translation> </message> @@ -35809,92 +35827,92 @@ <translation>Boutons standards</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>Appliquer</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>Abandon</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>Annuler</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>Ignorer</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>Tout enregistrer</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>Enregistrer</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>Abondonner les modifications</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>Oui à tout</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>Ouvrir</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>Réinitialiser</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>Non</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>Aide</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>Non à tout</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>Réessayer</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>Restaurer les valeurs par défaut</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>Oui</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>Fermer</translation> </message> @@ -37644,7 +37662,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> @@ -37752,7 +37770,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> @@ -38422,7 +38440,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> @@ -43266,7 +43284,7 @@ <translation>Executées</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Coverage</translation> </message> @@ -43316,7 +43334,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> @@ -43344,7 +43362,7 @@ <translation>Effacer toutes les infos</translation> </message> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation>Résultats du profiling</translation> </message> @@ -47990,7 +48008,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> @@ -48000,7 +48018,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> @@ -49468,7 +49486,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> @@ -50674,7 +50692,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> @@ -53292,7 +53310,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>Subversion Diff</translation> </message> @@ -53569,12 +53587,12 @@ <translation>Log Subversion</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>Révision</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>Auteur</translation> </message> @@ -53584,7 +53602,7 @@ <translation>Date</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>Message</translation> </message> @@ -54071,7 +54089,7 @@ <translation>&Protocole:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54182,7 +54200,7 @@ <translation>Sélectionner le protocole d'accès au référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55481,7 +55499,7 @@ <translation>ignoré</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation>Status Subversion</translation> </message> @@ -55491,7 +55509,7 @@ <translation>Commit des changements dans le référentiel...</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> @@ -60979,7 +60997,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Tests unitaires</translation> </message> @@ -71810,24 +71828,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71836,23 +71854,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71863,12 +71881,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71879,13 +71897,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><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_it.ts Sun Nov 06 13:39:36 2016 +0100 +++ b/i18n/eric6_it.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>Aggiungere segnalibro</translation> </message> @@ -1782,7 +1782,7 @@ <translation>Modifica &Indirizzo</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>Can&cella</translation> </message> @@ -2494,12 +2494,12 @@ <translation>Premi per salvare il tracciamento chiamate su un file di testo</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="109"/> <source>From</source> <translation>Da</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation>A</translation> </message> @@ -2664,7 +2664,7 @@ <translation>Premi per cancellare un edit condiviso</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Pulisci</translation> </message> @@ -2963,7 +2963,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 privilegiata ClickToFlash</translation> </message> @@ -3349,37 +3349,37 @@ <translation>Messaggio</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>Statistiche...</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>Premi per mostrare alcune statistiche dell'ultima esecuzione</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>Mostra</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>Premi per mostrare tutti i file che contengono problematiche</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>Errore: {0}</translation> </message> @@ -3389,7 +3389,7 @@ <translation>Corregge:{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>Nessun problema trovato.</translation> </message> @@ -3414,12 +3414,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> @@ -3434,12 +3434,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">Errori</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> @@ -3543,6 +3543,11 @@ <source>&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> @@ -4927,7 +4932,7 @@ <translation type="unfinished">Dominio:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7733,7 +7738,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>Downloads</translation> </message> @@ -8231,92 +8236,92 @@ <translation>Pulsanti standard</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>Termina</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>Applica</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>Cancella</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>Chiudi</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>Dimentica</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>Aiuto</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>Ignora</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 tutto</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>Apri</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>Resetta</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>Ripristina default</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>Ritenta</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>Salva</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>Salva tutto</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 tutto</translation> </message> @@ -10370,7 +10375,7 @@ <translation>Premi per selezionare il file API dalla lista dei file API installati</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>Aggiungi dalle APIs installate</translation> </message> @@ -10380,7 +10385,7 @@ <translation>Premi per compilare le definizioni APIs selezionate</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> <source>Compile APIs</source> <translation>Compila APIs</translation> </message> @@ -10405,7 +10410,7 @@ <translation>Premi per selezionare un file delle API dalla lista di quelli installati dai 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>Aggiungi dalle API dei plugin</translation> </message> @@ -11415,7 +11420,7 @@ <translation>Seleziona il riempimento di fine linea.</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>Riempi fino a fine linea</translation> </message> @@ -11460,7 +11465,7 @@ <translation>Seleziona il font.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Font</translation> </message> @@ -12926,7 +12931,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>Disabilitato</translation> </message> @@ -13710,7 +13715,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>Invia un bug report</translation> </message> @@ -15163,12 +15168,12 @@ <translation type="unfinished">Notificazioni</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">Host</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> @@ -15183,7 +15188,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> @@ -16327,7 +16332,7 @@ <translation type="unfinished">Nome:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16337,7 +16342,7 @@ <translation type="unfinished">DImensione:</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> @@ -16372,7 +16377,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> @@ -16800,7 +16805,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>Installazione script GreaseMonkey</translation> </message> @@ -22080,445 +22085,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> - <translation>Il processo hg è terminato con codice di uscita {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <translation type="obsolete">Il processo hg è terminato con codice di uscita {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> - <translation>Non posso avviare l'eseguibile hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <translation type="obsolete">Non posso avviare l'eseguibile hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Create project repository</source> <translation>Crea il repository del progetto</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>Il repository del progetto non può essere creato.</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>Creazione repository 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 iniziale nel repository 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>Clonazione del progetto dal repository 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>Sincronizzazione con il repository 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>Aggiunta di file/directory al repository 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>Rimozione di file/directory dal repository 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>Rinomino {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>Annullamento modifiche</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>Merge</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 Mercurial</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>Copia di {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>Pulling da un repository Mercurial remoto</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>Pushing in un repository Mercurial remoto</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>Creazione Branch nel repository 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>Verifica dell'integrità del repository 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>Visualizzazione combinata della impostazioni di configurazione</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>Visualizzazione degli alias per i repository remoti</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>Recupero da una transazione interrotta</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>Le directory di lavoro devono essere aggiornate ?</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>Visualizzazione branch corrente</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>Crea 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>Applica changegroup</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>Sottocomando Bisect ({0}) non valido.</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>Anteprima changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <source>Identifying project directory</source> + <translation>Identificazione directory del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <source>Create .hgignore file</source> + <translation>Crea il file .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></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>Anteprima changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> - <source>Identifying project directory</source> - <translation>Identificazione directory del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source>Create .hgignore file</source> - <translation>Crea il file .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository 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>Mercurial Changegroup Files (*.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 Changegroup Files (*.hg);;All Files (*)</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>Ritiro 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>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></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">Il processo {0} non può essere avviato. Assicurarsi che sia nel 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 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 <{0}>.</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">Segnalibro 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 type="unfinished">Cancella segnalibro</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">Seleziona il segnalibro da cancellare:</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">Cancella Segnalibro 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 type="unfinished">Rinomina Segnalibro 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 type="unfinished">Sposta Segnalibro 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 type="unfinished">Estrai Segnalibro</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">Seleziona il segnalibro da estrarre:</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">Etrae segnalibro da un repository 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 type="unfinished">Inserisce Segnalibro</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">Seleziona il segnalibro da inserire:</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">Inserisce segnalibro in un repository 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 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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22526,7 +22531,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> @@ -23615,7 +23620,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> @@ -23625,7 +23630,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> @@ -24260,7 +24265,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>Revisione</translation> </message> @@ -24451,12 +24456,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -24627,12 +24632,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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> @@ -24773,7 +24778,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>Mercurial Log</translation> </message> @@ -24803,17 +24808,17 @@ <translation>Seleziona il campo su cui filtrare</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>Revisione</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>Autore</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>Messaggio</translation> </message> @@ -28726,7 +28731,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> @@ -28868,7 +28873,7 @@ <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel 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> @@ -28993,7 +28998,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> @@ -29730,22 +29735,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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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> @@ -30053,20 +30058,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">Il processo hg è terminato con codice di uscita {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">Il processo hg non è finito entro i 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished">Non posso avviare l'eseguibile hg.</translation> + </message> </context> <context> <name>Histedit</name> @@ -30197,7 +30225,7 @@ <translation>Premi per rimuovere gli elementi selezionati</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>&Rimuovi</translation> </message> @@ -36069,92 +36097,92 @@ <translation>Pulsanti standard</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>Applica</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>Termina</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>Cancella</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>Ignora</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>Salva tutto</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>Salva</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>Dimentica</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 tutto</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>Apri</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>Resetta</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>Aiuto</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 tutto</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>Ritenta</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>Ripristina default</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>Chiudi</translation> </message> @@ -37921,7 +37949,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> @@ -38029,7 +38057,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> @@ -38701,7 +38729,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>Password salvate</translation> </message> @@ -43564,7 +43592,7 @@ <translation>Eseguite</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Coverage</translation> </message> @@ -43614,7 +43642,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> @@ -43642,7 +43670,7 @@ <translation>Cancella tutte le informazioni</translation> </message> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation>Risultati profilazione</translation> </message> @@ -48267,7 +48295,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> @@ -48277,7 +48305,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> @@ -49745,7 +49773,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> @@ -50949,7 +50977,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> @@ -53597,7 +53625,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>Subversion Diff</translation> </message> @@ -53875,12 +53903,12 @@ <translation>Log Subversion</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>Revisione</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>Autore</translation> </message> @@ -53890,7 +53918,7 @@ <translation>Data</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>Messaggio</translation> </message> @@ -54377,7 +54405,7 @@ <translation>&Protocollo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54488,7 +54516,7 @@ <translation>Seleziona il protocollo per accedere al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55788,7 +55816,7 @@ <translation>ignorato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation>Stato Subversion</translation> </message> @@ -55798,7 +55826,7 @@ <translation>Committa modifiche nel repository...</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> @@ -61337,7 +61365,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Unittest</translation> </message> @@ -72170,24 +72198,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -72196,24 +72224,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -72223,12 +72251,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -72245,13 +72273,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_pt.ts Sun Nov 06 13:39:36 2016 +0100 +++ b/i18n/eric6_pt.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>Adicionar Marcador</translation> </message> @@ -1767,7 +1767,7 @@ <translation>Pressionar para apagar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&Apagar</translation> </message> @@ -2504,12 +2504,12 @@ <translation>Pressionar para gravar o rastreio de chamadas como ficheiro 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>Para</translation> </message> @@ -2617,7 +2617,7 @@ <translation>Pressionar para limpar a lista de anfitriões</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Limpar</translation> </message> @@ -2969,7 +2969,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 de Confiança de ClickToFlash</translation> </message> @@ -3356,37 +3356,37 @@ <translation>Mensagem</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></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> - <source>Eric</source> - <translation></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> + <source>Eric</source> + <translation></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/> <source>Statistics...</source> <translation>Estatí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>Pressionar para mostrar algumas estatísticas da última execução</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>Pressionar para mostrar todos os ficheiros que tenham algum 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>Erro: {0}</translation> </message> @@ -3396,7 +3396,7 @@ <translation>Corrigir: {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>Não se encontraram problemas.</translation> </message> @@ -3421,12 +3421,12 @@ <translation>Mostrar ignorado</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>A preparar ficheiros...</translation> </message> @@ -3441,12 +3441,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>Erros</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>A transferir dados...</translation> </message> @@ -3550,6 +3550,11 @@ <source>&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> @@ -4929,7 +4934,7 @@ <translation type="unfinished">Domínio:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7747,7 +7752,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> @@ -8206,92 +8211,92 @@ <translation>Botões Padrão</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>Cancelar</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>Fechar</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>Ajuda</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>Não</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>Não a tudo</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></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>Reinicializar</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>Repor predefinições</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>Tentar de Novo</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>Gravar</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>Gravar tudo</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>Sim</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>Sim a tudo</translation> </message> @@ -10339,7 +10344,7 @@ <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados</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>Adicionar desde APIs instalados</translation> </message> @@ -10349,7 +10354,7 @@ <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados pelos complementos</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>Adicionar desde APIs de Complementos</translation> </message> @@ -10359,7 +10364,7 @@ <translation>Pressionar para compilar a definição de APIs selecionada</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> @@ -11413,7 +11418,7 @@ <translation>Selecionar tipo de letra.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Tipo de Letra</translation> </message> @@ -11423,7 +11428,7 @@ <translation>Selecionar preenchimento até ao fim de linha.</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>Preencher até fim de linha</translation> </message> @@ -12974,7 +12979,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>Inabilitado</translation> </message> @@ -13683,7 +13688,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 relatório de falho</translation> </message> @@ -15135,12 +15140,12 @@ <translation type="unfinished">Notificações</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">Anfitrião</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> @@ -15155,7 +15160,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> @@ -16299,7 +16304,7 @@ <translation type="unfinished">Nome:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16309,7 +16314,7 @@ <translation type="unfinished">Tamanho:</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> @@ -16344,7 +16349,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> @@ -16772,7 +16777,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>Instalação de Script GreaseMonkey</translation> </message> @@ -22051,445 +22056,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> - <translation>O processo hg terminou com o código de saída {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <translation type="obsolete">O processo hg terminou com o código de saída {0}</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> - <translation>Não se pôde iniciar o executável hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <translation type="obsolete">Não se pôde iniciar o executável hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Create project repository</source> <translation>Criar repositorio do projeto</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>O repositorio do projeto não se pôde criar.</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>A criar 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 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>A clonar projeto dum 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>A sincronizar com o 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 adicionar ficheiros/diretorios ao 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>A retirar ficheiros/diretorios do 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>A renomear {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>Desfazer alterações</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>A mesclar</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="1633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> <source>Copying {0}</source> <translation>A copiar {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>A puxar dum repositorio Mercurial remoto</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>A empurrar a um repositorio Mercurial remoto</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>A criar ramo no repositorio Mercurial</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>A mostrar o ramo atual</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>A verificar a integridade do 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>A mostrar as definições de configuração combinadas</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>A recuperar duma transação interrompida</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>A identificar o diretorio do projeto</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>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></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>Criar conjunto de alterações</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><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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>O diretorio de trabalho deve ser atualizado?</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>A retirar ficheiros apenas do repositorio Mercurial</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>Não foi dada revisão. Terminando...</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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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>Mudar 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 type="unfinished">Copiar Conjuntos de Alterações</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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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>Aplicar Alterações</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>Desfazer alterações</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>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></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>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</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="1157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Re-Merge</source> <translation>Remesclar</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>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</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="2303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</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>Apagar 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>Selecionar o marcador a apagar:</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>Apagar o 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>Renomear o 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 o 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>Puxar 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>Selecionar o marcador a puxar:</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>A puxar marcador desde o repositório remoto de Mercurial</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>Empurrar 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>Selecione o marcador a empurrar:</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>A empurrar marcador a um repositório remoto de Mercurial</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22497,7 +22502,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> @@ -23604,7 +23609,7 @@ <translation>Pressionar para maracar as entradas selecionadas como 'resolvido'</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>Resolvido</translation> </message> @@ -23614,7 +23619,7 @@ <translation>Pressionar para marcar as entradas selecionadas como 'sem resolver'</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>Sem resolver</translation> </message> @@ -24256,7 +24261,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>Revisão</translation> </message> @@ -24447,12 +24452,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>O ficheiro <b>{0}</b> não se pôde ler. </p><p>Motivo: {1}</p></translation> </message> @@ -24623,12 +24628,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>O ficheiro <b>{0}</b> não se pôde ler. </p><p>Motivo: {1}</p></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> @@ -24769,7 +24774,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>Registo de Mercurial</translation> </message> @@ -24809,17 +24814,17 @@ <translation>Selecionar o campo a filtrar</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>Revisão</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>Mensagem</translation> </message> @@ -28708,7 +28713,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>Estado de Mercurial</translation> </message> @@ -28850,7 +28855,7 @@ <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</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>Cometido</translation> </message> @@ -28970,7 +28975,7 @@ <translation>tudo</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>Diferenças</translation> </message> @@ -29833,22 +29838,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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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> @@ -30156,20 +30161,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">O processo hg terminou com o código de saída {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">O processo hg não acabou em 30s.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished">Não se pôde iniciar o executável hg.</translation> + </message> </context> <context> <name>Histedit</name> @@ -30300,7 +30328,7 @@ <translation>Pressionar para retirar as entradas selecionadas</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>&Retirar</translation> </message> @@ -36186,92 +36214,92 @@ <translation>Botões Padrão</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>Terminar</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>Gravar tudo</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>Gravar</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>Sim a tudo</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>Restablecer</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>Não</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>Ajuda</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>Não a tudo</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>Tentar de Novo</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>Repor predefinições</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>Sim</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>Fechar</translation> </message> @@ -37971,7 +37999,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> @@ -38079,7 +38107,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>Seleção Visual</translation> </message> @@ -38749,7 +38777,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>Senhas Gravadas</translation> </message> @@ -43549,7 +43577,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> @@ -43628,7 +43656,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> @@ -43636,7 +43664,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> @@ -48171,7 +48199,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> @@ -48181,7 +48209,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> @@ -49644,7 +49672,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>Lista de Confiança para Envío de Referer</translation> </message> @@ -50844,7 +50872,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> @@ -53366,7 +53394,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> @@ -53668,17 +53696,17 @@ <translation type="unfinished">Selecionar o campo a filtrar</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>Revisão</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>Mensagem</translation> </message> @@ -54132,7 +54160,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -54236,7 +54264,7 @@ <translation type="unfinished">Selecionar o protocolo para aceder ao repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation type="unfinished">&URL:</translation> </message> @@ -55453,7 +55481,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> @@ -55729,7 +55757,7 @@ <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</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">Cometido</translation> </message> @@ -61048,7 +61076,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Teste Unitário</translation> </message> @@ -71836,24 +71864,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71862,24 +71890,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71890,12 +71918,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71912,13 +71940,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_ru.ts Sun Nov 06 13:39:36 2016 +0100 +++ b/i18n/eric6_ru.ts Sun Nov 06 17:02:45 2016 +0100 @@ -3235,37 +3235,37 @@ <translation>Сообщение</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>Статистика...</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>Показать результаты последней проверки</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>Показать</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>Показать все файлы, содержащие ошибки</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>Ошибка: {0}</translation> </message> @@ -3275,7 +3275,7 @@ <translation>Исправлено: {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>Проблем со стилем не найдено.</translation> </message> @@ -3300,12 +3300,12 @@ <translation>Показывать проигнорированные</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} (проигнорировано)</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>Подготовка файлов...</translation> </message> @@ -3320,12 +3320,12 @@ <translation>Задайте максимально допустимую сложность кода (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>Ошибки</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>Передача данных...</translation> </message> @@ -3429,6 +3429,11 @@ <source>&Reset Defaults</source> <translation>&Сброс к стандартным</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> @@ -21464,445 +21469,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> - <translation>Процесс hg завершен с кодом возврата {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <translation type="obsolete">Процесс hg завершен с кодом возврата {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 не завершился в течение 30 секунд.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> - <translation>Невозможно запустить исполняемый файл hg.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <translation type="obsolete">Невозможно запустить исполняемый файл hg.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</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>Невозможно создать репозиторий проекта.</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>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>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>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>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>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>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>Переименование {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>Откат изменений</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>Слияние</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: Команда</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>Копирование {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>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>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>Mercurial: Создание ветви в репозитории</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>Отображение текущей ветви</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>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>Отображение обобщенных параметров конфигурации</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>Отображение алиасов удалённых репозиториев</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>Восстановление после прерванной транзакции</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>Идентификация директории проекта</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>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></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>Создать группу изменений</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 (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></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>Просмотр группы изменений</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 (*.hg);;Все файлы (*)</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>Применить группу изменений</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>Обновить рабочую директорию?</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>Неправильная Bisect подкоманда ({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="2771"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial: Bisect ({0})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</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>Отмена набора изменений</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>Не задана ревизия. Отмена...</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>Откатить последнюю транзакцию</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>Вы действительно хотите откатить последнюю транзакцию?</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>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>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></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>Импорт патча</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>Экспорт патчей</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>Изменить фазу</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>Копировать набор изменений</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>Копировать набор изменений (продолжение)</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>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></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>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></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>Фиксация изменений</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>Фиксация влияет на файлы с несохраненными изменениями. Продолжить ли фиксацию?</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>Откатить изменения</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>Вы действительно хотите откатить все изменения в этих файлах и директориях?</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>Вы действительно хотите откатить все изменения в проекте?</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>Создать неверсированный архив</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: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b></p></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>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</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>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 <{0}>.</source> <translation>Создана новая ветвь <{0}>.</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>Вершина текущей ветви</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>Отмена незавершённого слияния</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: Закладка</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>Удалить закладку</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>Выберите закладку для удаления:</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: Удалить закладку</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: Переименовать закладку</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: Переместить закладку</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>Затянуть закладку</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>Выберите закладку для затягивания:</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>Mercurial: Загрузка закладки из удалённого репозитория</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>Протолкнуть закладку</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>Выберите закладку для проталкивания:</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>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</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>Повторить слияние</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>Вы действительно хотите повторить слияние этих файлов или директорий?</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>Вы действительно хотите повторить слияние проекта?</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>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/> <source>Marking as 'unresolved'</source> <translation>Пометить как 'неразрешенный'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Marking as 'resolved'</source> <translation>Пометить как 'разрешенный'</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>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные bundles-пакеты, сохраненные в области резервного копирования <b>{0}</b>?</p></translation> </message> @@ -23796,12 +23801,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>Редактирование сообщения фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -23972,7 +23977,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -29039,22 +29044,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>Удалить отпечаток хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Должен ли отпечаток хоста <b>{0}</b> быть на самом деле удален?</p></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>Правка конфигурации пользователя</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>Вы можете потерять все изменения, сделанные в данном диалоге. Может сначала сохранить все данные?</translation> </message> @@ -29362,20 +29367,43 @@ <translation>Введите Hostname</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>Отпечаток:</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>Введите отпечаток хоста</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>Введите отпечаток</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 завершен с кодом возврата {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">Процесс hg не завершился в течение 30 секунд.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished">Невозможно запустить исполняемый файл hg.</translation> + </message> </context> <context> <name>Histedit</name> @@ -71250,24 +71278,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71277,23 +71305,23 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Набор изменений</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71304,12 +71332,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71326,14 +71354,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Заголовок #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr></translation>
--- a/i18n/eric6_tr.ts Sun Nov 06 13:39:36 2016 +0100 +++ b/i18n/eric6_tr.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>Yerimi Ekle</translation> </message> @@ -1750,7 +1750,7 @@ <translation>Seçilen girişi silmek için basınız</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>&Sil</translation> </message> @@ -2468,12 +2468,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">Den</translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation type="unfinished">E</translation> </message> @@ -2581,7 +2581,7 @@ <translation>Sunucu listesini temizlemek için basınız</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation>Temizle</translation> </message> @@ -2938,7 +2938,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> @@ -3299,37 +3299,37 @@ <translation type="unfinished">Mesaj</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">Göster</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">Hata: {0}</translation> </message> @@ -3339,7 +3339,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">Sorun bulunamadı.</translation> </message> @@ -3364,12 +3364,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> @@ -3384,12 +3384,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">Hatalar</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> @@ -3493,6 +3493,11 @@ <source>&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> @@ -4872,7 +4877,7 @@ <translation type="unfinished">Etki Alanı:</translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7627,7 +7632,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> @@ -8102,92 +8107,92 @@ <translation>Standart Düğmeler</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>Vazgeç</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>Kullan</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>Vazgeç</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>Kapat</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>Iskartaya ayırmak</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>Yardım</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>Yoksay</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>Hayır</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>Hepsini değil</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>Tamam</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>Aç</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>Başadön</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>Öntanımlı değerlere geridön</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>Tekrar Dene</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>Kaydet</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>Hepsini kaydet</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>Evet</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>Evet hepsini</translation> </message> @@ -10232,7 +10237,7 @@ <translation>Kurulan API dosyalarının listesinden bir API dosyası seçmek için basınız</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>Kurulan API'lerden ekle</translation> </message> @@ -10242,7 +10247,7 @@ <translation>Kurulen eklentilerin API dosya listesinden bir API dosyası seçmek için basınız</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>Eklenti API'lerinden ekle</translation> </message> @@ -10252,7 +10257,7 @@ <translation>Seçilen API'lerin tanımlarının derlenmesi için basınız</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> <source>Compile APIs</source> <translation>API'leri Derle</translation> </message> @@ -11306,7 +11311,7 @@ <translation>Yazı tipini seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation>Yazı Tipi</translation> </message> @@ -11316,7 +11321,7 @@ <translation>Satır sonuna kadar dolrurmak için seç.</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>Satırın sonuna kadar doldur</translation> </message> @@ -12812,7 +12817,7 @@ <translation>Mod:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation>Onaylanmamış</translation> </message> @@ -13546,7 +13551,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>Hata raporu gönder</translation> </message> @@ -14995,12 +15000,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> @@ -15015,7 +15020,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> @@ -16157,7 +16162,7 @@ <translation type="unfinished">Adı:</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16167,7 +16172,7 @@ <translation type="unfinished">Boyut:</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> @@ -16202,7 +16207,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> @@ -16628,7 +16633,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> @@ -21873,447 +21878,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>Bilgi havuzu projesi oluştur</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>Mercurial kaynak havauzu oluşturuluyor</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>Yenşden adlandırılıyor {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>Değişiklikler eski haline alınıyor</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>Birleştiriliyor</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 komut</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>Kopyalanıyor {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>Uzak Mercurial kaynak havuzundan çekiliyor</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><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></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>Değişimgrubu oluştur</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 Değiştirme grubu Dosyaları (*.hg)</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>Değişimgrubu öngörünümü</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 Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</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="2616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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">Değişiklikleri başa döndür</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><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></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">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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 <{0}>.</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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22321,7 +22316,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> @@ -23407,7 +23402,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> @@ -23417,7 +23412,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> @@ -24052,7 +24047,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">Gözden Geçirme</translation> </message> @@ -24243,12 +24238,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -24419,12 +24414,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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> @@ -24565,7 +24560,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>Mercurial Günlüğü</translation> </message> @@ -24595,17 +24590,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>Gözden Geçirme</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>Yazar</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>Mesaj</translation> </message> @@ -28487,7 +28482,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 Durumu</translation> </message> @@ -28629,7 +28624,7 @@ <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</translation> </message> @@ -28749,7 +28744,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> @@ -29475,22 +29470,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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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> @@ -29798,20 +29793,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> @@ -29942,7 +29960,7 @@ <translation>Seçilen girişi kaldırmak için basınız</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>Kaldı&r</translation> </message> @@ -35809,92 +35827,92 @@ <translation>Standart Düğmeler</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>Kullan</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>Vazgeç</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>Vazgeç</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>Yoksay</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>Hepsini kaydet</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>Kaydet</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>Iskartaya ayırmak</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>Evet hepsini</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>Aç</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>Başadön</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>Tamam</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>Hayır</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>Yardım</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>Hepsini değil</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>Tekrar Dene</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>Öntanımlı değerlere geridön</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>Evet</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>Kapat</translation> </message> @@ -37649,7 +37667,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> @@ -37757,7 +37775,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> @@ -38428,7 +38446,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>Kaydedilmiş Parolalar</translation> </message> @@ -43229,7 +43247,7 @@ <translation>Gerçekleşen</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>Kapsam</translation> </message> @@ -43309,7 +43327,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> @@ -43317,7 +43335,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>Kesit Sonucu</translation> </message> @@ -47845,7 +47863,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> @@ -47855,7 +47873,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> @@ -49323,7 +49341,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> @@ -50527,7 +50545,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> @@ -53128,7 +53146,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>Altsürüm farklılıkları</translation> </message> @@ -53431,17 +53449,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>Gözden Geçirme</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>Yazar</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>Mesaj</translation> </message> @@ -53895,7 +53913,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -53997,7 +54015,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> @@ -55227,7 +55245,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>Altsürüm Durumu</translation> </message> @@ -55504,7 +55522,7 @@ <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</translation> </message> @@ -60756,7 +60774,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="400"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation>Birimtest</translation> </message> @@ -71558,24 +71576,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -71584,23 +71602,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71611,12 +71629,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></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><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71627,13 +71645,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><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_zh_CN.ts Sun Nov 06 13:39:36 2016 +0100 +++ b/i18n/eric6_zh_CN.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>添加书签</translation> </message> @@ -1787,7 +1787,7 @@ <translation>编辑地址(&A)</translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation>删除(&D)</translation> </message> @@ -2481,12 +2481,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> @@ -2649,7 +2649,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>清除</translation> </message> @@ -2946,7 +2946,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> @@ -3308,37 +3308,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">错误：{0}</translation> </message> @@ -3348,7 +3348,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> @@ -3373,12 +3373,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> @@ -3393,12 +3393,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> @@ -3502,6 +3502,11 @@ <source>&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> @@ -4873,7 +4878,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -7647,7 +7652,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>下载</translation> </message> @@ -8097,92 +8102,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>终止</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>应用</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>取消</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>关闭</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>放弃</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>帮助</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>忽略</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> @@ -10227,7 +10232,7 @@ <translation>点击以从已安装的 AIP 文件列表中选择一个 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>从已安装的 API 中添加</translation> </message> @@ -10237,7 +10242,7 @@ <translation>点击以从通过插件安装的 API 文件列表中选择一个 API 文件</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>从插件 API 中添加</translation> </message> @@ -10247,7 +10252,7 @@ <translation>点击编译已选 API 定义</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> <source>Compile APIs</source> <translation>编译 API</translation> </message> @@ -11301,7 +11306,7 @@ <translation>选择字体。</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> @@ -11311,7 +11316,7 @@ <translation>选择行尾填充。</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>填充到行尾</translation> </message> @@ -12832,7 +12837,7 @@ <translation>模式：</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation>已禁用</translation> </message> @@ -13571,7 +13576,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>发送错误报告</translation> </message> @@ -15017,12 +15022,12 @@ <translation>通知</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> @@ -15037,7 +15042,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>地理位置</translation> </message> @@ -16177,7 +16182,7 @@ <translation type="unfinished">名称：</translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -16187,7 +16192,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> @@ -16222,7 +16227,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> @@ -16648,7 +16653,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> @@ -21863,445 +21868,445 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> <source>The hg process finished with the exit code {0}</source> - <translation>hg 进程已结束，返回值为 {0}</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <translation type="obsolete">hg 进程已结束，返回值为 {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 进程没有在 30 秒内结束。</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/> <source>Could not start the hg executable.</source> - <translation>无法启动 hg 可执行程序。</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <translation type="obsolete">无法启动 hg 可执行程序。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/> <source>Create project repository</source> <translation>创建项目仓库</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>无法创建项目仓库。</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>创建 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>向 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 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="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="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="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="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="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="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="2631"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="2519"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></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="2663"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></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="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="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="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="2616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></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><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></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><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></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><p>The sub-repositories file .hgsub does not exist. Aborting...</p></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><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></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">进程 {0} 无法启动。请保证它处在搜索路径中。</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 <{0}>.</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 'unresolved'</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 'resolved'</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><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -22309,7 +22314,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> @@ -23395,7 +23400,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> @@ -23405,7 +23410,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> @@ -24030,7 +24035,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> @@ -24221,12 +24226,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -24397,12 +24402,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><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></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> @@ -24543,7 +24548,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> @@ -24573,17 +24578,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> @@ -28480,7 +28485,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> @@ -28621,7 +28626,7 @@ <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</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> @@ -28741,7 +28746,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> @@ -29465,22 +29470,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><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="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> @@ -29788,20 +29793,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 进程已结束，返回值为 {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">hg 进程没有在 30 秒内结束。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished">无法启动 hg 可执行程序。</translation> + </message> </context> <context> <name>Histedit</name> @@ -29932,7 +29960,7 @@ <translation>点击移除选中的条目</translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation>移除(&R)</translation> </message> @@ -35785,92 +35813,92 @@ <translation>标准按钮</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>应用</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>终止</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>取消</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>忽略</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>全部保存</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>保存</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>放弃</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>全部是</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>打开</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>重置</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>确定</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>否</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>帮助</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>全部否</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>重试</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>恢复默认</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>是</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>关闭</translation> </message> @@ -37620,7 +37648,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> @@ -37728,7 +37756,7 @@ <translation>按下以可视化地选择坐标，松开以得到坐标</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> <source>Visual Selection</source> <translation>可视化选择</translation> </message> @@ -38400,7 +38428,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> @@ -43211,7 +43239,7 @@ <translation>已执行</translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation>覆盖率</translation> </message> @@ -43290,7 +43318,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">%v/%m 文件</translation> </message> @@ -43298,7 +43326,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>剖析结果</translation> </message> @@ -47971,7 +47999,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> @@ -47981,7 +48009,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> @@ -49449,7 +49477,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> @@ -50656,7 +50684,7 @@ <translation>复制预览(&P)</translation> </message> <message> - <location filename="../Snapshot/SnapWidget.py" line="531"/> + <location filename="../Snapshot/SnapWidget.ui" line="20"/> <source>eric6 Snapshot</source> <translation>eric6 快照</translation> </message> @@ -53263,7 +53291,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>Subversion 差异</translation> </message> @@ -53566,17 +53594,17 @@ <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>修订</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>作者</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>消息</translation> </message> @@ -54037,7 +54065,7 @@ <translation><b>URL</b><p>输入模块的 URL 。由于仓库具有标准布局，则该 URL 必须包含主干、标签或分支部分。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL：</translation> </message> @@ -54152,7 +54180,7 @@ <translation type="obsolete">通过文件夹选择对话框或储存库浏览器选择储存库 URL</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL：</translation> </message> @@ -55392,7 +55420,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>Subversion 状态</translation> </message> @@ -55664,7 +55692,7 @@ <translation>进程生成错误</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>提交</translation> </message> @@ -60952,7 +60980,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> @@ -71775,46 +71803,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><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></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><tr><td><b>Tags</b></td><td>{0}</td></tr></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><tr><td><b>Branches</b></td><td>{0}</td></tr></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><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></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><tr><td><b>Tip</b></td><td></td></tr> </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><tr><td><b>Changeset</b></td><td>{0}</td></tr></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><tr><td><b>Parents</b></td><td>{0}</td></tr></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><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71822,12 +71850,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><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></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><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -71838,13 +71866,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><tr><td><b>Head #{0}</b></td><td></td></tr> </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><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
