Mercurial Repositories > eric / changeset
changeset
Added support for exporting patches.
Tue, 13 Sep 2011 19:41:54 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 13 Sep 2011 19:41:54 +0200
- changeset 1315
- faafd2aa48d5
- parent 1314
- 7e7b88c58fda
- child 1316
- 0bb67aced672
Added support for exporting patches.
--- a/APIs/Python3/eric5.api Tue Sep 13 18:39:41 2011 +0200 +++ b/APIs/Python3/eric5.api Tue Sep 13 19:41:54 2011 +0200 @@ -3397,6 +3397,12 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.start?4(fn, versions=None, bundle=None, qdiff=False) eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog?1(vcs, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.getParameters?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_changesetsEdit_textChanged?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_directoryButton_clicked?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_directoryEdit_textChanged?4(p0) +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_patternEdit_textChanged?4(p0) +eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension.shutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension?1(vcs) eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.getActions?4() @@ -3720,6 +3726,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditUserConfig?4() +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExport?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir)
--- a/Documentation/Help/source.qhp Tue Sep 13 18:39:41 2011 +0200 +++ b/Documentation/Help/source.qhp Tue Sep 13 19:41:54 2011 +0200 @@ -422,6 +422,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> @@ -8558,6 +8559,15 @@ <keyword name="HgImportDialog.getParameters" id="HgImportDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.getParameters" /> <keyword name="HgImportDialog.on_patchFileButton_clicked" id="HgImportDialog.on_patchFileButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.on_patchFileButton_clicked" /> <keyword name="HgImportDialog.on_patchFileEdit_textChanged" id="HgImportDialog.on_patchFileEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.on_patchFileEdit_textChanged" /> + <keyword name="HgExportDialog (Module)" id="HgExportDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html" /> + <keyword name="HgExportDialog" id="HgExportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog" /> + <keyword name="HgExportDialog (Constructor)" id="HgExportDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.__init__" /> + <keyword name="HgExportDialog.__updateOK" id="HgExportDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.__updateOK" /> + <keyword name="HgExportDialog.getParameters" id="HgExportDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.getParameters" /> + <keyword name="HgExportDialog.on_changesetsEdit_textChanged" id="HgExportDialog.on_changesetsEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.on_changesetsEdit_textChanged" /> + <keyword name="HgExportDialog.on_directoryButton_clicked" id="HgExportDialog.on_directoryButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.on_directoryButton_clicked" /> + <keyword name="HgExportDialog.on_directoryEdit_textChanged" id="HgExportDialog.on_directoryEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.on_directoryEdit_textChanged" /> + <keyword name="HgExportDialog.on_patternEdit_textChanged" id="HgExportDialog.on_patternEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html#HgExportDialog.on_patternEdit_textChanged" /> <keyword name="hg (Module)" id="hg (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html" /> <keyword name="Hg" id="Hg" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> @@ -8580,6 +8590,7 @@ <keyword name="Hg.hgCreateIgnoreFile" id="Hg.hgCreateIgnoreFile" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCreateIgnoreFile" /> <keyword name="Hg.hgEditConfig" id="Hg.hgEditConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditConfig" /> <keyword name="Hg.hgEditUserConfig" id="Hg.hgEditUserConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditUserConfig" /> + <keyword name="Hg.hgExport" id="Hg.hgExport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExport" /> <keyword name="Hg.hgExtendedDiff" id="Hg.hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExtendedDiff" /> <keyword name="Hg.hgForget" id="Hg.hgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgForget" /> <keyword name="Hg.hgGetBranchesList" id="Hg.hgGetBranchesList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBranchesList" /> @@ -8685,6 +8696,7 @@ <keyword name="HgProjectHelper.__hgCreateIgnore" id="HgProjectHelper.__hgCreateIgnore" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCreateIgnore" /> <keyword name="HgProjectHelper.__hgEditRepoConfig" id="HgProjectHelper.__hgEditRepoConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgEditRepoConfig" /> <keyword name="HgProjectHelper.__hgEditUserConfig" id="HgProjectHelper.__hgEditUserConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgEditUserConfig" /> + <keyword name="HgProjectHelper.__hgExport" id="HgProjectHelper.__hgExport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExport" /> <keyword name="HgProjectHelper.__hgExtendedDiff" id="HgProjectHelper.__hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExtendedDiff" /> <keyword name="HgProjectHelper.__hgHeads" id="HgProjectHelper.__hgHeads" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgHeads" /> <keyword name="HgProjectHelper.__hgIdentify" id="HgProjectHelper.__hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentify" /> @@ -11413,6 +11425,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html Tue Sep 13 19:41:54 2011 +0200 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog</h1> +<p> +Module implementing a dialog to enter data for the Mercurial export command. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgExportDialog">HgExportDialog</a></td> +<td>Class documentation goes here.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgExportDialog" ID="HgExportDialog"></a> +<h2>HgExportDialog</h2> +<p> + Class documentation goes here. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgExportDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgExportDialog.__init__">HgExportDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgExportDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgExportDialog.getParameters">getParameters</a></td> +<td>Public method to retrieve the export data.</td> +</tr><tr> +<td><a href="#HgExportDialog.on_changesetsEdit_textChanged">on_changesetsEdit_textChanged</a></td> +<td>Private slot to react on changes of the changesets edit.</td> +</tr><tr> +<td><a href="#HgExportDialog.on_directoryButton_clicked">on_directoryButton_clicked</a></td> +<td>Private slot called by pressing the export directory selection button.</td> +</tr><tr> +<td><a href="#HgExportDialog.on_directoryEdit_textChanged">on_directoryEdit_textChanged</a></td> +<td>Private slot to react on changes of the export directory edit.</td> +</tr><tr> +<td><a href="#HgExportDialog.on_patternEdit_textChanged">on_patternEdit_textChanged</a></td> +<td>Private slot to react on changes of the export file name pattern edit.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgExportDialog.__init__" ID="HgExportDialog.__init__"></a> +<h4>HgExportDialog (Constructor)</h4> +<b>HgExportDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgExportDialog.__updateOK" ID="HgExportDialog.__updateOK"></a> +<h4>HgExportDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgExportDialog.getParameters" ID="HgExportDialog.getParameters"></a> +<h4>HgExportDialog.getParameters</h4> +<b>getParameters</b>(<i></i>) +<p> + Public method to retrieve the export data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the output file name, the list of revisions to export, + and flags indicating to compare against the second parent, to treat all + files as text, to omit dates in the diff headers and to use the git extended + diff format (string, list of strings, boolean, boolean, boolean, boolean) +</dd> +</dl><a NAME="HgExportDialog.on_changesetsEdit_textChanged" ID="HgExportDialog.on_changesetsEdit_textChanged"></a> +<h4>HgExportDialog.on_changesetsEdit_textChanged</h4> +<b>on_changesetsEdit_textChanged</b>(<i></i>) +<p> + Private slot to react on changes of the changesets edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the line edit (string) +</dd> +</dl><a NAME="HgExportDialog.on_directoryButton_clicked" ID="HgExportDialog.on_directoryButton_clicked"></a> +<h4>HgExportDialog.on_directoryButton_clicked</h4> +<b>on_directoryButton_clicked</b>(<i></i>) +<p> + Private slot called by pressing the export directory selection button. +</p><a NAME="HgExportDialog.on_directoryEdit_textChanged" ID="HgExportDialog.on_directoryEdit_textChanged"></a> +<h4>HgExportDialog.on_directoryEdit_textChanged</h4> +<b>on_directoryEdit_textChanged</b>(<i>p0</i>) +<p> + Private slot to react on changes of the export directory edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the line edit (string) +</dd> +</dl><a NAME="HgExportDialog.on_patternEdit_textChanged" ID="HgExportDialog.on_patternEdit_textChanged"></a> +<h4>HgExportDialog.on_patternEdit_textChanged</h4> +<b>on_patternEdit_textChanged</b>(<i>p0</i>) +<p> + Private slot to react on changes of the export file name pattern edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the line edit (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Sep 13 18:39:41 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Sep 13 19:41:54 2011 +0200 @@ -100,6 +100,9 @@ <td><a href="#HgProjectHelper.__hgEditUserConfig">__hgEditUserConfig</a></td> <td>Private slot used to edit the repository configuration file.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgExport">__hgExport</a></td> +<td>Private slot used to export revisions to patch files.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgExtendedDiff">__hgExtendedDiff</a></td> <td>Private slot used to perform a hg diff with the selection of revisions.</td> </tr><tr> @@ -285,6 +288,11 @@ <b>__hgEditUserConfig</b>(<i></i>) <p> Private slot used to edit the repository configuration file. +</p><a NAME="HgProjectHelper.__hgExport" ID="HgProjectHelper.__hgExport"></a> +<h4>HgProjectHelper.__hgExport</h4> +<b>__hgExport</b>(<i></i>) +<p> + Private slot used to export revisions to patch files. </p><a NAME="HgProjectHelper.__hgExtendedDiff" ID="HgProjectHelper.__hgExtendedDiff"></a> <h4>HgProjectHelper.__hgExtendedDiff</h4> <b>__hgExtendedDiff</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Sep 13 18:39:41 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Sep 13 19:41:54 2011 +0200 @@ -128,6 +128,9 @@ <td><a href="#Hg.hgEditUserConfig">hgEditUserConfig</a></td> <td>Public method used to edit the user configuration file.</td> </tr><tr> +<td><a href="#Hg.hgExport">hgExport</a></td> +<td>Public method to export patches to files.</td> +</tr><tr> <td><a href="#Hg.hgExtendedDiff">hgExtendedDiff</a></td> <td>Public method used to view the difference of a file/directory to the Mercurial repository.</td> </tr><tr> @@ -529,7 +532,17 @@ <b>hgEditUserConfig</b>(<i></i>) <p> Public method used to edit the user configuration file. -</p><a NAME="Hg.hgExtendedDiff" ID="Hg.hgExtendedDiff"></a> +</p><a NAME="Hg.hgExport" ID="Hg.hgExport"></a> +<h4>Hg.hgExport</h4> +<b>hgExport</b>(<i>name</i>) +<p> + Public method to export patches to files. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the project to export from (string) +</dd> +</dl><a NAME="Hg.hgExtendedDiff" ID="Hg.hgExtendedDiff"></a> <h4>Hg.hgExtendedDiff</h4> <b>hgExtendedDiff</b>(<i>name</i>) <p>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Tue Sep 13 18:39:41 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Tue Sep 13 19:41:54 2011 +0200 @@ -90,6 +90,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html">HgDiffDialog</a></td> <td>Module implementing a dialog to show the output of the hg diff command process.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html">HgExportDialog</a></td> +<td>Module implementing a dialog to enter data for the Mercurial export command.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html">HgExtension</a></td> <td>Module implementing the base class for Mercurial extension interfaces.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Tue Sep 13 19:41:54 2011 +0200 @@ -0,0 +1,117 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for the Mercurial export command. +""" + +import os + +from PyQt4.QtCore import pyqtSlot, QDir +from PyQt4.QtGui import QDialog, QDialogButtonBox, QFileDialog + +from E5Gui import E5FileDialog +from E5Gui.E5Completers import E5DirCompleter + +from .Ui_HgExportDialog import Ui_HgExportDialog + +import Utilities + + +class HgExportDialog(QDialog, Ui_HgExportDialog): + """ + Class documentation goes here. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.__directoryCompleter = E5DirCompleter(self.directoryEdit) + + # set default values for directory and pattern + self.patternEdit.setText("%b_%r_%h_%n_of_%N.diff") + self.directoryEdit.setText(QDir.tempPath()) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + + if self.directoryEdit.text() == "": + enabled = False + elif self.patternEdit.text() == "": + enabled = False + elif self.changesetsEdit.toPlainText() == "": + enabled = False + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(str) + def on_directoryEdit_textChanged(self, p0): + """ + Private slot to react on changes of the export directory edit. + + @param txt contents of the line edit (string) + """ + self.__updateOK() + + @pyqtSlot() + def on_directoryButton_clicked(self): + """ + Private slot called by pressing the export directory selection button. + """ + dn = E5FileDialog.getExistingDirectory( + self, + self.trUtf8("Export Patches"), + self.directoryEdit.text(), + QFileDialog.Options(QFileDialog.Option(0))) + + if dn: + self.directoryEdit.setText(Utilities.toNativeSeparators(dn)) + + @pyqtSlot(str) + def on_patternEdit_textChanged(self, p0): + """ + Private slot to react on changes of the export file name pattern edit. + + @param txt contents of the line edit (string) + """ + self.__updateOK() + + @pyqtSlot() + def on_changesetsEdit_textChanged(self): + """ + Private slot to react on changes of the changesets edit. + + @param txt contents of the line edit (string) + """ + self.__updateOK() + + def getParameters(self): + """ + Public method to retrieve the export data. + + @return tuple naming the output file name, the list of revisions to export, + and flags indicating to compare against the second parent, to treat all + files as text, to omit dates in the diff headers and to use the git extended + diff format (string, list of strings, boolean, boolean, boolean, boolean) + """ + return ( + os.path.join(Utilities.toNativeSeparators(self.directoryEdit.text()), + self.patternEdit.text()), + self.changesetsEdit.toPlainText().splitlines(), + self.switchParentCheckBox.isChecked(), + self.textCheckBox.isChecked(), + self.datesCheckBox.isChecked(), + self.gitCheckBox.isChecked() + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui Tue Sep 13 19:41:54 2011 +0200 @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgExportDialog</class> + <widget class="QDialog" name="HgExportDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>456</width> + <height>299</height> + </rect> + </property> + <property name="windowTitle"> + <string>Export Patches</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Export Directory:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="directoryEdit"/> + </item> + <item row="0" column="2"> + <widget class="QPushButton" name="directoryButton"> + <property name="toolTip"> + <string>Press to select the export directory via a directory selection dialog</string> + </property> + <property name="text"> + <string notr="true">...</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>File Name Pattern:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="patternEdit"> + <property name="toolTip"> + <string>Enter the file name pattern for the export files</string> + </property> + <property name="whatsThis"> + <string><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Changesets:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QPlainTextEdit" name="changesetsEdit"> + <property name="toolTip"> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="switchParentCheckBox"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Compare Against Second Parent</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="textCheckBox"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Treat all Files as Text</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="datesCheckBox"> + <property name="text"> + <string>Omit Dates</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="gitCheckBox"> + <property name="text"> + <string>Use Git extended Diff-Format</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>directoryEdit</tabstop> + <tabstop>directoryButton</tabstop> + <tabstop>patternEdit</tabstop> + <tabstop>changesetsEdit</tabstop> + <tabstop>switchParentCheckBox</tabstop> + <tabstop>textCheckBox</tabstop> + <tabstop>datesCheckBox</tabstop> + <tabstop>gitCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgExportDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgExportDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Sep 13 18:39:41 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Sep 13 19:41:54 2011 +0200 @@ -835,6 +835,19 @@ )) self.hgImportAct.triggered[()].connect(self.__hgImport) self.actions.append(self.hgImportAct) + + self.hgExportAct = E5Action(self.trUtf8('Export Patches'), + self.trUtf8('Export Patches...'), + 0, 0, self, 'mercurial_import') + self.hgExportAct.setStatusTip(self.trUtf8( + 'Export revisions to patch files' + )) + self.hgExportAct.setWhatsThis(self.trUtf8( + """<b>Export Patches</b>""" + """<p>This exports revisions of the project to patch files.</p>""" + )) + self.hgExportAct.triggered[()].connect(self.__hgExport) + self.actions.append(self.hgExportAct) def initMenu(self, menu): """ @@ -887,6 +900,7 @@ patchMenu = QMenu(self.trUtf8("Patch Management"), menu) patchMenu.setTearOffEnabled(True) patchMenu.addAction(self.hgImportAct) + patchMenu.addAction(self.hgExportAct) self.subMenus.append(patchMenu) bisectMenu = QMenu(self.trUtf8("Bisect"), menu) @@ -1256,6 +1270,12 @@ if res: self.project.reopenProject() + def __hgExport(self): + """ + Private slot used to export revisions to patch files. + """ + self.vcs.hgExport(self.project.ppath) + def __hgRevert(self): """ Private slot used to revert changes made to the local project.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Sep 13 18:39:41 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Sep 13 19:41:54 2011 +0200 @@ -49,6 +49,7 @@ from .HgUtilities import getConfigPath from .HgClient import HgClient from .HgImportDialog import HgImportDialog +from .HgExportDialog import HgExportDialog from .BookmarksExtension.bookmarks import Bookmarks from .QueuesExtension.queues import Queues @@ -2430,6 +2431,47 @@ return res + def hgExport(self, name): + """ + Public method to export patches to files. + + @param name directory name of the project to export from (string) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return + + dlg = HgExportDialog() + if dlg.exec_() == QDialog.Accepted: + filePattern, revisions, switchParent, allText, noDates, git = \ + dlg.getParameters() + + args = [] + args.append("export") + args.append("--output") + args.append(filePattern) + args.append("--verbose") + if switchParent: + args.append("--switch-parent") + if allText: + args.append("--text") + if noDates: + args.append("--nodates") + if git: + args.append("--git") + for rev in revisions: + args.append(rev) + + dia = HgDialog(self.trUtf8("Export Patches"), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + ############################################################################ ## Methods to handle extensions are below. ############################################################################
--- a/changelog Tue Sep 13 18:39:41 2011 +0200 +++ b/changelog Tue Sep 13 19:41:54 2011 +0200 @@ -31,6 +31,7 @@ --- modified pull such, that it will try to apply an existing changegroups file first (created by an hg incoming) --- added support for importing patches + --- added support for exporting patches --- added configuration option to create backup files when reverting changes - enhancements to the web browser -- added the "Do Not Track" feature
--- a/eric5.e4p Tue Sep 13 18:39:41 2011 +0200 +++ b/eric5.e4p Tue Sep 13 19:41:54 2011 +0200 @@ -930,6 +930,7 @@ <Source>Plugins/VcsPlugins/vcsMercurial/HgClient.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1193,6 +1194,7 @@ <Form>Preferences/ConfigurationPages/SecurityPage.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_cs.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13749,42 +13749,42 @@ <translation>Povolit zásuvné moduly</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Procházet cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Zapnout disk cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Velikost cache:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Zadejte maximální velikost diskové cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation> MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Tisk</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Vybrat pro tisk barev pozadí a obrázků</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Tisknout barvy pozadí a obrázky</translation> </message> @@ -13844,52 +13844,52 @@ <translation>Nastavit výchozí domovskou stranu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Historie</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Odebrat položky historie:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Vybrat interval pro vypršení platnosti položek historie</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Odebrat položky historie:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Vybrat interval pro vypršení platnosti položek historie</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Po jednom dni</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Po týdnu</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Po dvou týdnech</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Po měsíci</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Po roce</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Ručně</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>Při ukončení aplikace</translation> </message> @@ -13929,37 +13929,37 @@ <translation type="obsolete">Uložit hesla</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation type="unfinished"></translation> </message> @@ -13984,20 +13984,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">Jazyk:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15634,42 +15644,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <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="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <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="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15679,47 +15689,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <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="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <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="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <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="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -15734,112 +15744,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <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="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <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="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <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="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <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="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <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="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15849,65 +15859,70 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <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="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16987,6 +17002,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18931,7 +19022,7 @@ <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -18966,7 +19057,7 @@ <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -18981,7 +19072,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -19071,7 +19162,7 @@ <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19196,17 +19287,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -19241,7 +19332,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19321,7 +19412,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19341,15 +19432,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25518,42 +25629,42 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>SSL chyby</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Certifikáty</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Zadejte uživatelské jméno a heslo pro {0}', realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL chyby pro <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Chcete tyto chyby ignorovat?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certifikáty:<br/>{0}<br/>Chcete akceptovat všechny certifikáty?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Vydatavel: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Neplatný před: {0}<br/>Platný do: {1}</translation> </message> @@ -25563,12 +25674,12 @@ <translation type="obsolete"><br/>Alternativní jména:<ul><li>{0}</li></ul></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -27533,27 +27644,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -49797,30 +49908,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49831,23 +49942,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49855,7 +49966,7 @@ <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="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_de.ts Tue Sep 13 19:41:54 2011 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12589,7 +12588,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -13495,42 +13494,42 @@ <translation>Plugins aktivieren</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Browser Puffer</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Offline-Speicher aktivieren</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Speichergröße:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Gib die Maximalgröße des Offline-Speichers ein</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Drucken</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Auswählen, um Hintergrundfarben und -bilder zu drucken</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Hintergrundfarben und -bilder drucken</translation> </message> @@ -13590,52 +13589,52 @@ <translation>Standardseite setzen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Chronik</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Chronikeinträge löschen:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Wähle den Zeitraum zum löschen von Chronikeinträgen</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Chronikeinträge löschen:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Wähle den Zeitraum zum löschen von Chronikeinträgen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Nach einem Tag</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Nach einer Woche</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Nach zwei Wochen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Nach einem Monat</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Nach einem Jahr</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Manuell</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>Beim Beenden</translation> </message> @@ -13660,37 +13659,37 @@ <translation><b>Standardschema</b><p>Wähle das Standardschema. Diese Schema wird URLs vorangestellt, die keines enthalten.</p></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation>Regelung</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation>Auswählen, um zuerst im Netzwerk zu suchen</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation>Zwischenspeicher aktuell halten</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation>Auswählen, um Daten im Zwischenspeicher zu bevorzugen</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation>Zwischenspeicher verwenden, wenn möglich</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation>Zwischenspeicher aktuell halten</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation>Auswählen, um Daten im Zwischenspeicher zu bevorzugen</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation>Zwischenspeicher verwenden, wenn möglich</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation>Auswählen, um nur Daten aus dem Zwischenspeicher zu verwenden</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation>Offline-Browsing Modus</translation> </message> @@ -13715,20 +13714,30 @@ <translation>Auswahlmarken aktivieren</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation>Online Suche</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation>Sprache:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation>Wähle die für die Online Suche zu verwendende Sprache</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation>Auswählen, um das "Nicht Verfolgen" Feature zu aktivieren</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation>Websites mitteilen, dass ich nicht verfolgt werden möchte</translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15286,260 +15295,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <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="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <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="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <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="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <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="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <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="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <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="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <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="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <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="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <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="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <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="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16593,6 +16607,95 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation>Exportverzeichnis:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation>Drücken, um das Exportverzeichnis über einen Verzeichnisauswahldialog zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation>Dateinamenmuster:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation>Gib das Dateinamenmuster für die Exportdateien ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation><b>Dateinamenmuster</b> +<p>Gib hier das Dateinamenmuster ein, das zur Erzeugung der Namen der Exportdateien +verwendet wird. Gültige Muster sind:</p> +<table> +<tr><td>%%</td><td>ein "%" Zeichen</td></tr> +<tr><td>%H</td><td>Changeset Hash (40 hexadezimale Zeichen)</td></tr> +<tr><td>%N</td><td>Anzahl zu erzeugender Patches</td></tr> +<tr><td>%R</td><td>Revisionsnummer</td></tr> +<tr><td>%b</td><td>Basisnamen des exportierenden Repositories</td></tr> +<tr><td>%h</td><td>Kurzform des Changeset Hashes (12 hexadezimale Zeichen)</td></tr> +<tr><td>%n</td><td>Sequenznummer mit führenden Nullen beginnend bei 1</td></tr> +<tr><td>%r</td><td>Revisionsnummer mit führenden Nullen</td></tr> +</table> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation>Änderungssätze:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation>Gegen zweiten Vorgänger vergleichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation>Alle Dateien als Text betrachten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation>Datum auslassen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation>Git erweitertes Diff-Format verwenden</translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18486,7 +18589,7 @@ <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -18521,7 +18624,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> @@ -18536,7 +18639,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -18616,7 +18719,7 @@ <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18721,7 +18824,7 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option 'force' hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> @@ -18746,12 +18849,12 @@ <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -18786,7 +18889,7 @@ <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -18866,7 +18969,7 @@ <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -18886,15 +18989,35 @@ <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation>Patches exportieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation>Änderungssätze in Patchdateien exportieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -24877,52 +25000,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für '{0}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Gib Nutzernamen und Kennwort für '{0}' und Realm '{1}' ein</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Fehler für <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Sollen diese Fehler ignoriert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Zertifikate</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Zertifikate:<br/>{0}<br/>Sollen alle diese Zertifikate akzeptiert werden?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Aussteller: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Gültig ab: {0}<br/>Gültig bis: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation>Name: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation><br/>Organisation: {0}</translation> </message> @@ -26886,27 +27009,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation>Wähle den Python2 Interpreter</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation> </message> @@ -48939,24 +49062,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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> @@ -48965,7 +49088,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48982,24 +49105,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49010,7 +49133,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <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>
--- a/i18n/eric5_en.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_en.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13496,127 +13496,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> - <source>On application exit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> - <source>Browser Cache</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <source>On application exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> + <source>Browser Cache</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> - <source>Offline browsing mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> - <source>Cache size:</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <source>Offline browsing mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> + <source>Cache size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -13631,20 +13631,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15201,260 +15211,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16497,6 +16512,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18499,7 +18590,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -18614,32 +18705,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -18674,7 +18765,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -18754,7 +18845,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -18774,15 +18865,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -24750,52 +24861,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -26748,27 +26859,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -48504,30 +48615,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48538,23 +48649,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -48562,7 +48673,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_es.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13620,42 +13620,42 @@ <translation>Habilitar Plugins</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Caché del navegador</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Habilitar caché de disco</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Tamaño de Caché:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Introduzca el tamaño máximo del caché de disco</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation> MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Imprimiendo</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Seleccionar para imprimir los colores de fondo y las imágenes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Imprimir colores de fondo e imágenes</translation> </message> @@ -13715,52 +13715,52 @@ <translation>Establecer como página de inicio por defecto</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Historial</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Eliminar elementos de historial:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Seleccionar el período de expiración de entradas de historial</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Eliminar elementos de historial:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Seleccionar el período de expiración de entradas de historial</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Después de un día</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Después de una semana</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Después de dos semanas</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Después de un mes</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Después de un año</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Manual</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>A la salida de la aplicación</translation> </message> @@ -13810,37 +13810,37 @@ <translation type="obsolete">Utilizar DNS prefetching (pre-búsqueda) para mejorar la carga de páginas</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation>Política</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation>Seleccionar para preferir la red</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation>Mantener la caché sincronizada</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation>Seleccionar para preferir datos de caché</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation>Utilizar datos de caché siempre que sea posible</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation>Mantener la caché sincronizada</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation>Seleccionar para preferir datos de caché</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation>Utilizar datos de caché siempre que sea posible</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation>Seleccionar para utilizar datos en caché solamente</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation>Modo de navegación offline</translation> </message> @@ -13865,20 +13865,30 @@ <translation>Habilitar claves de acceso</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation>Búsqueda en la Web</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation>Idioma:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation>Seleccione el idioma a utilizar para las búsqueads web</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15456,42 +15466,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <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="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> @@ -15501,32 +15511,32 @@ <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <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="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <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="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -15541,190 +15551,195 @@ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <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="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <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="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <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="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <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="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <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="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <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="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16808,6 +16823,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18777,7 +18868,7 @@ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> @@ -18797,7 +18888,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> @@ -18812,7 +18903,7 @@ <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -18902,7 +18993,7 @@ <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19007,7 +19098,7 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation>Especial</translation> </message> @@ -19032,12 +19123,12 @@ <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -19072,7 +19163,7 @@ <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -19152,7 +19243,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19172,15 +19263,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25202,52 +25313,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>Errores de SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Certificados</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Introduzca nombre de usuario y contraseña para '{0}', reino {1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Errores de SSL para <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>¿Desea ignorar estos errores?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certificados:<br/>{0}<br/>¿Desea aceptar todos estos certificados?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Emisor: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>No válido antes de: {0}<br/>Válido Hasta: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation>Nombre: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation><br/>Organización: {0}</translation> </message> @@ -27208,27 +27319,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation>Seleccionar Intérprete de Python2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation>Seleccionar el intérprete de Python2 a utilizar:</translation> </message> @@ -49273,17 +49384,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49294,31 +49405,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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> @@ -49327,7 +49438,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49344,7 +49455,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <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>
--- a/i18n/eric5_fr.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_fr.ts Tue Sep 13 19:41:54 2011 +0200 @@ -14836,42 +14836,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -14931,52 +14931,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation type="unfinished">Historique</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation type="unfinished"></translation> </message> @@ -15001,37 +15001,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation type="unfinished"></translation> </message> @@ -15056,20 +15056,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -16786,87 +16796,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16876,175 +16886,180 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18106,6 +18121,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -20034,7 +20125,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -20069,7 +20160,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -20084,7 +20175,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20164,7 +20255,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20269,7 +20360,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20294,12 +20385,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20334,7 +20425,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20414,7 +20505,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20434,15 +20525,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -26917,52 +27028,52 @@ <translation type="obsolete"><b>Connexion au proxy '%1' en utilisant:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation type="unfinished">Erreurs SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -29154,27 +29265,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -53721,30 +53832,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53755,23 +53866,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -53779,7 +53890,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_it.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13560,42 +13560,42 @@ <translation>Abilita Plugins</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Cache del Browser</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Abilita cache su disco</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Dimensione cache:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Inserisci la dimensione massima della cache su disco</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Stampa in corso</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Seleziona per stampare i colori di background e le immagini</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Stampa colori di background e le immagini</translation> </message> @@ -13655,52 +13655,52 @@ <translation>Imposta come home page di default</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Cronologia</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Rimuovi elementi della cronologia:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Seleziona la scadenza degli elementi della cronologia</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Rimuovi elementi della cronologia:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Seleziona la scadenza degli elementi della cronologia</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Dopo un giorno</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Dopo una settimana</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Dopo due settimane</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Dopo un mese</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Dopo un anno</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Manuale</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>All'uscita dell'applicazione</translation> </message> @@ -13750,37 +13750,37 @@ <translation type="obsolete">Usa il prescarico del DNS per migliorare il caricamento della pagina</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation>Policy</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation>Seleziona per preferire la rete</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation>Mantieni sincronizzata la cache</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation>Seleziona per preferire i dati in cache</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation>Usa la cache quando possibile</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation>Mantieni sincronizzata la cache</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation>Seleziona per preferire i dati in cache</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation>Usa la cache quando possibile</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation>Seleziona per usare solo i dati della cache</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation>Modalità navigazione offline</translation> </message> @@ -13805,20 +13805,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">Linguaggio:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15395,42 +15405,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <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="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -15440,47 +15450,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <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="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <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="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -15495,175 +15505,180 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <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="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <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="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <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="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <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="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <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="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <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="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16743,6 +16758,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18696,7 +18787,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -18731,7 +18822,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -18746,7 +18837,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -18836,7 +18927,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18961,17 +19052,17 @@ <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -19006,7 +19097,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19086,7 +19177,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19106,15 +19197,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25119,52 +25230,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>Errori SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Certificati</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Inserisci utente e password per '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Inserisci utente e password per '{0}', dominio '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Errori SSL per <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Vuoi ignorarli ?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Certificati:<br/>{0}<br/>Vuoi accettare tutti questi certificati?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Emettitore: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Non valido prima: {0}<br/>Valido Fino: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation>Nome: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation><br/>Organizzazione: {0}</translation> </message> @@ -27127,27 +27238,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -49186,24 +49297,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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> @@ -49212,7 +49323,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49229,24 +49340,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49256,7 +49367,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_ru.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13660,42 +13660,42 @@ <translation>Разрешить плагины</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation>Кэш просмотрщика</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Запретить кэш на диске</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Размер кэша:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Максимальный размер кэша на диске</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Печать</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Печатать фон и изображения</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Печатать фон и изображения</translation> </message> @@ -13755,52 +13755,52 @@ <translation>По умолчанию</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>История</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Удалить историю:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Задайте срок хранения для истории</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Удалить историю:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Задайте срок хранения для истории</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Через день</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Через неделю</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>Через две недели</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Через месяц</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Через год</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>Вручную</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation>При выходе из приложения</translation> </message> @@ -13850,37 +13850,37 @@ <translation type="obsolete">Использовать прелзагрузку DNS для улучшения загрузки страниц</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation>Правила</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation>Предпочитать сеть</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation>Держать кэш синхронизированным</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation>Предпочитать данные из кэша</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation>По возможности использовать данные из кэша</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation>Держать кэш синхронизированным</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation>Предпочитать данные из кэша</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation>По возможности использовать данные из кэша</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation>Использовать данные только из кэша</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation>Offline режим</translation> </message> @@ -13905,20 +13905,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">Язык:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15502,42 +15512,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -15547,32 +15557,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -15587,190 +15597,195 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16845,6 +16860,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18803,7 +18894,7 @@ <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> @@ -18838,7 +18929,7 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -18853,7 +18944,7 @@ <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> @@ -18943,7 +19034,7 @@ <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> @@ -19048,7 +19139,7 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation>Специфический</translation> </message> @@ -19073,12 +19164,12 @@ <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -19113,7 +19204,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19193,7 +19284,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19213,15 +19304,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25251,52 +25362,52 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>Ошибки SSL</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>Ошибки SSL для <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Игнорировать?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Сертификаты</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Сертификаты:<br/>{0}<br/>Принять?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Эмитент: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Не действительны ранее: {0}<br/>Действительны до: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation>Имя: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation><br/>Организация: {0}</translation> </message> @@ -27267,27 +27378,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -49435,17 +49546,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49456,30 +49567,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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> @@ -49489,7 +49600,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49506,7 +49617,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_tr.ts Tue Sep 13 19:41:54 2011 +0200 @@ -13845,92 +13845,92 @@ <translation type="obsolete">Parolaları kaydet</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation>Geçmiş</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation>Kaldırılacak geçmiş bilgilerini:</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation>Tarih girişlerinin sonlanma periyodlarını seçiniz</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation>Kaldırılacak geçmiş bilgilerini:</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation>Tarih girişlerinin sonlanma periyodlarını seçiniz</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation>Bir gün sonra</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation>Bir hafta sonra</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation>İki hafta sonra</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation>Bir ay sonra</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation>Bir yıl sonra</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation>El ile</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> - <source>On application exit</source> - <translation>Uygulamadan çık</translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> - <source>Browser Cache</source> - <translation>Gözatıcı Önbelleği</translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <source>On application exit</source> + <translation>Uygulamadan çık</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> + <source>Browser Cache</source> + <translation>Gözatıcı Önbelleği</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation>Disk belleğini etkinleştir</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation>Önbellek boyutu:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation>Disk önbelleğinin maksimum boyutunu giriniz</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation>MB</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation>Yazılıyor</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation>Arkaalan rengini ve görüntülerini yazdırmak için seçiniz</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation>Arkaalan rengini ve görüntülerini yazdır</translation> </message> @@ -13945,37 +13945,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation type="unfinished"></translation> </message> @@ -13990,20 +13990,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">Dil:</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -15635,87 +15645,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -15730,175 +15740,180 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <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="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <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="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16975,6 +16990,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -18978,7 +19069,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19073,17 +19164,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -19123,17 +19214,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -19168,7 +19259,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19248,7 +19339,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19268,15 +19359,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -25359,12 +25470,12 @@ <context> <name>NetworkAccessManager</name> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation><b> '{0}' için kullanıcı adını ve parolayı giriniz</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation><b> '{1}' alanı, '{0}' için kullanıcı adı ve parola giriniz</b></translation> </message> @@ -25374,42 +25485,42 @@ <translation type="obsolete"><b>'{0}' proxy'sini kullanarak bağlan:</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation>SSL Hataları</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation><p>SSL Hataları <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Bu hataları yoksaymak istiyor musunuz?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation>Sertifikalar</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation><p>Sertifalar:<br/>{0}<br/>Bu sertifikalrı kabul etmek istiyor musunuz?</p></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation><br/>Yayımcı: {0}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation><br/>Geçerlilik başlangıcı: {0}<br/>Geçerlilek bitişi: {1}</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -27432,27 +27543,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -49498,24 +49609,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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> @@ -49524,7 +49635,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49541,23 +49652,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -49568,7 +49679,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Tue Sep 13 18:39:41 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue Sep 13 19:41:54 2011 +0200 @@ -14802,42 +14802,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/> <source>Browser Cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/> <source>Enable disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/> <source>Cache size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/> <source>Enter the maximum size of the disk cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/> <source>Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/> <source>Select to print background colours and images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/> <source>Print background colours and images</source> <translation type="unfinished"></translation> </message> @@ -14897,52 +14897,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/> <source>History</source> <translation type="unfinished">历史</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/> - <source>Remove history items:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/> - <source>Select the period for expiration of history entries</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/> + <source>Remove history items:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/> + <source>Select the period for expiration of history entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/> <source>After one day</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/> <source>After one week</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/> <source>After two weeks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/> <source>After one month</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/> <source>After one year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/> <source>Manually</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/> <source>On application exit</source> <translation type="unfinished"></translation> </message> @@ -14967,37 +14967,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/> <source>Policy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/> <source>Select to prefer the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/> - <source>Keep cache in sync</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/> - <source>Select to prefer cached data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/> - <source>Use cache whenever possible</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/> + <source>Keep cache in sync</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/> + <source>Select to prefer cached data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/> + <source>Use cache whenever possible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/> <source>Select to use cached data only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/> <source>Offline browsing mode</source> <translation type="unfinished"></translation> </message> @@ -15022,20 +15022,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/> <source>Web Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/> <source>Language:</source> <translation type="unfinished">语言：</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/> <source>Select the language to be used for web searches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/> + <source>Select to enabled the "Do Not Track" feature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/> + <source>Tell web sites I do not want to be tracked</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpWebPage</name> @@ -16752,87 +16762,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16842,175 +16852,180 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> <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="2274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="2355"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/> <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="467"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <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="2561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <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="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18072,6 +18087,82 @@ </message> </context> <context> + <name>HgExportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/> + <source>Export Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> + <source>Enter the file name pattern for the export files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> + <source><b>File Name Pattern</b> +<p>Enter the file name pattern to be used to generate the export files +here. Valid recognized patterns are:</p> +<table> +<tr><td>%%</td><td>literal "%" character</td></tr> +<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr> +<tr><td>%N</td><td>number of patches being generated</td></tr> +<tr><td>%R</td><td>changeset revision number</td></tr> +<tr><td>%b</td><td>basename of the exporting repository</td></tr> +<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr> +<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr> +<tr><td>%r</td><td>zero-padded changeset revision number</td></tr> +</table> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <source>Compare Against Second Parent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <source>Treat all Files as Text</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <source>Omit Dates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <source>Use Git extended Diff-Format</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgFetchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> @@ -20000,7 +20091,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -20035,7 +20126,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -20050,7 +20141,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20130,7 +20221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20235,7 +20326,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20260,12 +20351,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20300,7 +20391,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20380,7 +20471,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20400,15 +20491,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <source>Export Patches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <source>Export revisions to patch files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -26889,52 +27000,52 @@ <translation type="obsolete"><b>连接到代理 '%1' ，使用：</b></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source>SSL Errors</source> <translation type="unfinished">SSL 错误</translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source>Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/> <source><b>Enter username and password for '{0}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/> <source><b>Enter username and password for '{0}', realm '{1}'</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/> <source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/> <source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/> <source><br/>Issuer: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/> <source><br/>Not valid before: {0}<br/>Valid Until: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/> <source>Name: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/> + <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/> <source><br/>Organization: {0}</source> <translation type="unfinished"></translation> </message> @@ -29120,27 +29231,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="944"/> + <location filename="Preferences/__init__.py" line="945"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="971"/> + <location filename="Preferences/__init__.py" line="972"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1064"/> + <location filename="Preferences/__init__.py" line="1065"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -53680,30 +53791,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/> <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="1707"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <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="1226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/> <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="1256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53714,23 +53825,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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> @@ -53738,7 +53849,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
