Mercurial Repositories > eric / changeset
changeset
Mercurial: removed the interface to the deprecated 'fetch' extension.
Fri, 28 Aug 2020 19:50:22 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 28 Aug 2020 19:50:22 +0200
- changeset 7679
- 5816200f021b
- parent 7678
- 285c786c4a9c
- child 7680
- a2840715cfa0
Mercurial: removed the interface to the deprecated 'fetch' extension.
--- a/eric6.e4p Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6.e4p Fri Aug 28 19:50:22 2020 +0200 @@ -484,10 +484,6 @@ <Source>eric6/Plugins/VcsPlugins/vcsMercurial/Config.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py</Source> - <Source>eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py</Source> - <Source>eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py</Source> - <Source>eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/__init__.py</Source> - <Source>eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py</Source> @@ -1734,7 +1730,6 @@ <Form>eric6/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.ui</Form> <Form>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui</Form> <Form>eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui</Form> - <Form>eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui</Form> <Form>eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui</Form> <Form>eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui</Form> <Form>eric6/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui</Form>
--- a/eric6/APIs/Python3/eric6.api Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/APIs/Python3/eric6.api Fri Aug 28 19:50:22 2020 +0200 @@ -4565,15 +4565,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage?1(plugin) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.getData?4() -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.on_recentComboBox_activated?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.initActions?4() -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.initMenu?4(mainMenu) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper.menuTitle?4() -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.FetchProjectHelper?1() -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.Fetch.hgFetch?4(name, revisions=None) -eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.Fetch?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.on_bookmarkCombo_editTextChanged?4(txt)
--- a/eric6/APIs/Python3/eric6.bas Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/APIs/Python3/eric6.bas Fri Aug 28 19:50:22 2020 +0200 @@ -295,8 +295,6 @@ FeedEditDialog QDialog Ui_FeedEditDialog FeedsDialog QDialog Ui_FeedsDialog FeedsManager QDialog Ui_FeedsManager -Fetch HgExtension -FetchProjectHelper HgExtensionProjectHelper FileDialogWizard QObject FileDialogWizardDialog QDialog Ui_FileDialogWizardDialog FileReport BaseReport @@ -425,7 +423,6 @@ HgExtension QObject HgExtensionProjectBrowserHelper QObject HgExtensionProjectHelper QObject -HgFetchDialog QDialog Ui_HgFetchDialog HgGpgSignDialog QDialog Ui_HgGpgSignDialog HgGpgSignaturesDialog QDialog Ui_HgGpgSignaturesDialog HgGraftDialog QDialog Ui_HgGraftDialog
--- a/eric6/Documentation/Help/source.qhp Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Documentation/Help/source.qhp Fri Aug 28 19:50:22 2020 +0200 @@ -455,11 +455,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> </section> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html"> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html" /> - </section> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html"> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html" /> @@ -5581,17 +5576,6 @@ <keyword name="FeedsManager.on_reloadAllButton_clicked" id="FeedsManager.on_reloadAllButton_clicked" ref="eric6.WebBrowser.Feeds.FeedsManager.html#FeedsManager.on_reloadAllButton_clicked" /> <keyword name="FeedsManager.on_reloadButton_clicked" id="FeedsManager.on_reloadButton_clicked" ref="eric6.WebBrowser.Feeds.FeedsManager.html#FeedsManager.on_reloadButton_clicked" /> <keyword name="FeedsManager.show" id="FeedsManager.show" ref="eric6.WebBrowser.Feeds.FeedsManager.html#FeedsManager.show" /> - <keyword name="Fetch" id="Fetch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html#Fetch" /> - <keyword name="Fetch (Constructor)" id="Fetch (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html#Fetch.__init__" /> - <keyword name="Fetch.hgFetch" id="Fetch.hgFetch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html#Fetch.hgFetch" /> - <keyword name="FetchExtension (Package)" id="FetchExtension (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html" /> - <keyword name="FetchProjectHelper" id="FetchProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper" /> - <keyword name="FetchProjectHelper (Constructor)" id="FetchProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.__init__" /> - <keyword name="FetchProjectHelper.__aboutToShowMenu" id="FetchProjectHelper.__aboutToShowMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.__aboutToShowMenu" /> - <keyword name="FetchProjectHelper.__hgFetch" id="FetchProjectHelper.__hgFetch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.__hgFetch" /> - <keyword name="FetchProjectHelper.initActions" id="FetchProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.initActions" /> - <keyword name="FetchProjectHelper.initMenu" id="FetchProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.initMenu" /> - <keyword name="FetchProjectHelper.menuTitle" id="FetchProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html#FetchProjectHelper.menuTitle" /> <keyword name="FileDialogWizard" id="FileDialogWizard" ref="eric6.Plugins.PluginWizardQFileDialog.html#FileDialogWizard" /> <keyword name="FileDialogWizard (Constructor)" id="FileDialogWizard (Constructor)" ref="eric6.Plugins.PluginWizardQFileDialog.html#FileDialogWizard.__init__" /> <keyword name="FileDialogWizard (Package)" id="FileDialogWizard (Package)" ref="index-eric6.Plugins.WizardPlugins.FileDialogWizard.html" /> @@ -7495,11 +7479,6 @@ <keyword name="HgExtensionProjectHelper.menuTitle" id="HgExtensionProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.menuTitle" /> <keyword name="HgExtensionProjectHelper.setObjects" id="HgExtensionProjectHelper.setObjects" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.setObjects" /> <keyword name="HgExtensionProjectHelper.shutdown" id="HgExtensionProjectHelper.shutdown" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.shutdown" /> - <keyword name="HgFetchDialog" id="HgFetchDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html#HgFetchDialog" /> - <keyword name="HgFetchDialog (Constructor)" id="HgFetchDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html#HgFetchDialog.__init__" /> - <keyword name="HgFetchDialog (Module)" id="HgFetchDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html" /> - <keyword name="HgFetchDialog.getData" id="HgFetchDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html#HgFetchDialog.getData" /> - <keyword name="HgFetchDialog.on_recentComboBox_activated" id="HgFetchDialog.on_recentComboBox_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html#HgFetchDialog.on_recentComboBox_activated" /> <keyword name="HgGpgSignDialog" id="HgGpgSignDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html#HgGpgSignDialog" /> <keyword name="HgGpgSignDialog (Constructor)" id="HgGpgSignDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html#HgGpgSignDialog.__init__" /> <keyword name="HgGpgSignDialog (Module)" id="HgGpgSignDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html" /> @@ -7599,7 +7578,6 @@ <keyword name="HgLogBrowserDialog.__branchColor" id="HgLogBrowserDialog.__branchColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__branchColor" /> <keyword name="HgLogBrowserDialog.__bundleActTriggered" id="HgLogBrowserDialog.__bundleActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bundleActTriggered" /> <keyword name="HgLogBrowserDialog.__closeHeadsActTriggered" id="HgLogBrowserDialog.__closeHeadsActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__closeHeadsActTriggered" /> - <keyword name="HgLogBrowserDialog.__fetchActTriggered" id="HgLogBrowserDialog.__fetchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__fetchActTriggered" /> <keyword name="HgLogBrowserDialog.__filterLogs" id="HgLogBrowserDialog.__filterLogs" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__filterLogs" /> <keyword name="HgLogBrowserDialog.__findItem" id="HgLogBrowserDialog.__findItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__findItem" /> <keyword name="HgLogBrowserDialog.__finish" id="HgLogBrowserDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__finish" /> @@ -11437,7 +11415,6 @@ <keyword name="ProjectFormsBrowser.handlePreferencesChanged" id="ProjectFormsBrowser.handlePreferencesChanged" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.handlePreferencesChanged" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html" /> @@ -17241,7 +17218,6 @@ <keyword name="extraneous_whitespace" id="extraneous_whitespace" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#extraneous_whitespace" /> <keyword name="factory" id="factory" ref="eric6.VCS.__init__.html#factory" /> <keyword name="factory" id="factory" ref="eric6.ViewManager.__init__.html#factory" /> - <keyword name="fetch (Module)" id="fetch (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html" /> <keyword name="filename_match" id="filename_match" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#filename_match" /> <keyword name="filterAnsiSequences" id="filterAnsiSequences" ref="eric6.Utilities.__init__.html#filterAnsiSequences" /> <keyword name="filterCharsFromFilename" id="filterCharsFromFilename" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#filterCharsFromFilename" /> @@ -18312,9 +18288,6 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html</file> @@ -19042,7 +19015,6 @@ <file>index-eric6.Plugins.VcsPlugins.vcsGit.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> - <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html</file>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,138 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog</title> -<meta charset="UTF-8"> -<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>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog</h1> - -<p> -Module implementing a dialog to enter data to be used for a fetch operation. -</p> -<h3>Global Attributes</h3> - -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> - -<table> - -<tr> -<td><a href="#HgFetchDialog">HgFetchDialog</a></td> -<td>Class implementing a dialog to enter data to be used for a fetch operation.</td> -</tr> -</table> -<h3>Functions</h3> - -<table> -<tr><td>None</td></tr> -</table> -<hr /> -<hr /> -<a NAME="HgFetchDialog" ID="HgFetchDialog"></a> -<h2>HgFetchDialog</h2> - -<p> - Class implementing a dialog to enter data to be used for a fetch operation. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgFetchDialog -<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="#HgFetchDialog.__init__">HgFetchDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgFetchDialog.getData">getData</a></td> -<td>Public method to get the data for the fetch operation.</td> -</tr> -<tr> -<td><a href="#HgFetchDialog.on_recentComboBox_activated">on_recentComboBox_activated</a></td> -<td>Private slot to select a commit message from recent ones.</td> -</tr> -</table> -<h3>Static Methods</h3> - -<table> -<tr><td>None</td></tr> -</table> - -<a NAME="HgFetchDialog.__init__" ID="HgFetchDialog.__init__"></a> -<h4>HgFetchDialog (Constructor)</h4> -<b>HgFetchDialog</b>(<i>vcs, parent=None</i>) - -<p> - Constructor -</p> -<dl> - -<dt><i>vcs</i> (Hg)</dt> -<dd> -reference to the Mercurial vcs object -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<a NAME="HgFetchDialog.getData" ID="HgFetchDialog.getData"></a> -<h4>HgFetchDialog.getData</h4> -<b>getData</b>(<i></i>) - -<p> - Public method to get the data for the fetch operation. -</p> -<dl> -<dt>Returns:</dt> -<dd> -tuple with the commit message and a flag indicating to switch - the merge order (string, boolean) -</dd> -</dl> -<a NAME="HgFetchDialog.on_recentComboBox_activated" ID="HgFetchDialog.on_recentComboBox_activated"></a> -<h4>HgFetchDialog.on_recentComboBox_activated</h4> -<b>on_recentComboBox_activated</b>(<i>txt</i>) - -<p> - Private slot to select a commit message from recent ones. -</p> -<dl> - -<dt><i>txt</i></dt> -<dd> -text of the selected entry (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,165 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper</title> -<meta charset="UTF-8"> -<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>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper</h1> - -<p> -Module implementing the fetch extension project helper. -</p> -<h3>Global Attributes</h3> - -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> - -<table> - -<tr> -<td><a href="#FetchProjectHelper">FetchProjectHelper</a></td> -<td>Class implementing the fetch extension project helper.</td> -</tr> -</table> -<h3>Functions</h3> - -<table> -<tr><td>None</td></tr> -</table> -<hr /> -<hr /> -<a NAME="FetchProjectHelper" ID="FetchProjectHelper"></a> -<h2>FetchProjectHelper</h2> - -<p> - Class implementing the fetch extension project helper. -</p> -<h3>Derived from</h3> -HgExtensionProjectHelper -<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="#FetchProjectHelper.__init__">FetchProjectHelper</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#FetchProjectHelper.__aboutToShowMenu">__aboutToShowMenu</a></td> -<td>Private slot to handle the aboutToShow signal of the background menu.</td> -</tr> -<tr> -<td><a href="#FetchProjectHelper.__hgFetch">__hgFetch</a></td> -<td>Private slot used to fetch changes from a remote repository.</td> -</tr> -<tr> -<td><a href="#FetchProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr> -<tr> -<td><a href="#FetchProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr> -<tr> -<td><a href="#FetchProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -</table> -<h3>Static Methods</h3> - -<table> -<tr><td>None</td></tr> -</table> - -<a NAME="FetchProjectHelper.__init__" ID="FetchProjectHelper.__init__"></a> -<h4>FetchProjectHelper (Constructor)</h4> -<b>FetchProjectHelper</b>(<i></i>) - -<p> - Constructor -</p> -<a NAME="FetchProjectHelper.__aboutToShowMenu" ID="FetchProjectHelper.__aboutToShowMenu"></a> -<h4>FetchProjectHelper.__aboutToShowMenu</h4> -<b>__aboutToShowMenu</b>(<i></i>) - -<p> - Private slot to handle the aboutToShow signal of the background menu. -</p> -<a NAME="FetchProjectHelper.__hgFetch" ID="FetchProjectHelper.__hgFetch"></a> -<h4>FetchProjectHelper.__hgFetch</h4> -<b>__hgFetch</b>(<i></i>) - -<p> - Private slot used to fetch changes from a remote repository. -</p> -<a NAME="FetchProjectHelper.initActions" ID="FetchProjectHelper.initActions"></a> -<h4>FetchProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) - -<p> - Public method to generate the action objects. -</p> -<a NAME="FetchProjectHelper.initMenu" ID="FetchProjectHelper.initMenu"></a> -<h4>FetchProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) - -<p> - Public method to generate the extension menu. -</p> -<dl> - -<dt><i>mainMenu</i></dt> -<dd> -reference to the main menu (QMenu) -</dd> -</dl> -<dl> -<dt>Returns:</dt> -<dd> -populated menu (QMenu) -</dd> -</dl> -<a NAME="FetchProjectHelper.menuTitle" ID="FetchProjectHelper.menuTitle"></a> -<h4>FetchProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) - -<p> - Public method to get the menu title. -</p> -<dl> -<dt>Returns:</dt> -<dd> -title of the menu (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,133 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch</title> -<meta charset="UTF-8"> -<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>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch</h1> - -<p> -Module implementing the fetch extension interface. -</p> -<h3>Global Attributes</h3> - -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> - -<table> - -<tr> -<td><a href="#Fetch">Fetch</a></td> -<td>Class implementing the fetch extension interface.</td> -</tr> -</table> -<h3>Functions</h3> - -<table> -<tr><td>None</td></tr> -</table> -<hr /> -<hr /> -<a NAME="Fetch" ID="Fetch"></a> -<h2>Fetch</h2> - -<p> - Class implementing the fetch extension interface. -</p> -<h3>Derived from</h3> -HgExtension -<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="#Fetch.__init__">Fetch</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#Fetch.hgFetch">hgFetch</a></td> -<td>Public method to fetch changes from a remote repository.</td> -</tr> -</table> -<h3>Static Methods</h3> - -<table> -<tr><td>None</td></tr> -</table> - -<a NAME="Fetch.__init__" ID="Fetch.__init__"></a> -<h4>Fetch (Constructor)</h4> -<b>Fetch</b>(<i>vcs</i>) - -<p> - Constructor -</p> -<dl> - -<dt><i>vcs</i></dt> -<dd> -reference to the Mercurial vcs object -</dd> -</dl> -<a NAME="Fetch.hgFetch" ID="Fetch.hgFetch"></a> -<h4>Fetch.hgFetch</h4> -<b>hgFetch</b>(<i>name, revisions=None</i>) - -<p> - Public method to fetch changes from a remote repository. -</p> -<dl> - -<dt><i>name</i> (str)</dt> -<dd> -directory name of the project to be fetched to -</dd> -<dt><i>revisions</i> (list of str)</dt> -<dd> -list of revisions to be pulled -</dd> -</dl> -<dl> -<dt>Returns:</dt> -<dd> -flag indicating, that the update contained an add - or delete -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.gpg.html Fri Aug 28 19:50:22 2020 +0200 @@ -36,7 +36,7 @@ <tr> <td><a href="#Gpg">Gpg</a></td> -<td>Class implementing the fetch extension interface.</td> +<td>Class implementing the gpg extension interface.</td> </tr> </table> <h3>Functions</h3> @@ -50,7 +50,7 @@ <h2>Gpg</h2> <p> - Class implementing the fetch extension interface. + Class implementing the gpg extension interface. </p> <h3>Derived from</h3> HgExtension @@ -86,7 +86,7 @@ </tr> <tr> <td><a href="#Gpg.shutdown">shutdown</a></td> -<td>Public method used to shutdown the fetch interface.</td> +<td>Public method used to shutdown the gpg interface.</td> </tr> </table> <h3>Static Methods</h3> @@ -164,7 +164,7 @@ <b>shutdown</b>(<i></i>) <p> - Public method used to shutdown the fetch interface. + Public method used to shutdown the gpg interface. </p> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Aug 28 19:50:22 2020 +0200 @@ -101,10 +101,6 @@ <td>Private slot to close the selected head revisions.</td> </tr> <tr> -<td><a href="#HgLogBrowserDialog.__fetchActTriggered">__fetchActTriggered</a></td> -<td>Private slot to fetch changes from a remote repository.</td> -</tr> -<tr> <td><a href="#HgLogBrowserDialog.__filterLogs">__filterLogs</a></td> <td>Private method to filter the log entries.</td> </tr> @@ -500,13 +496,6 @@ <p> Private slot to close the selected head revisions. </p> -<a NAME="HgLogBrowserDialog.__fetchActTriggered" ID="HgLogBrowserDialog.__fetchActTriggered"></a> -<h4>HgLogBrowserDialog.__fetchActTriggered</h4> -<b>__fetchActTriggered</b>(<i></i>) - -<p> - Private slot to fetch changes from a remote repository. -</p> <a NAME="HgLogBrowserDialog.__filterLogs" ID="HgLogBrowserDialog.__filterLogs"></a> <h4>HgLogBrowserDialog.__filterLogs</h4> <b>__filterLogs</b>(<i></i>)
--- a/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension</title> -<meta charset="UTF-8"> -<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> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension</h1> - -<p> -Package implementing the fetch extension support interface. -</p> - - -<h3>Modules</h3> -<table> - -<tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html">HgFetchDialog</a></td> -<td>Module implementing a dialog to enter data to be used for a fetch operation.</td> -</tr> -<tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the fetch extension project helper.</td> -</tr> -<tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html">fetch</a></td> -<td>Module implementing the fetch extension interface.</td> -</tr> -</table> -</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Aug 28 19:50:22 2020 +0200 @@ -41,10 +41,6 @@ <td>Package implementing the the Mercurial configuration page.</td> </tr> <tr> -<td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html">FetchExtension</a></td> -<td>Package implementing the fetch extension support interface.</td> -</tr> -<tr> <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html">GpgExtension</a></td> <td>Package implementing the gpg extension support interface.</td> </tr>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter data to be used for a fetch operation. -""" - - -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog - -from .Ui_HgFetchDialog import Ui_HgFetchDialog - - -class HgFetchDialog(QDialog, Ui_HgFetchDialog): - """ - Class implementing a dialog to enter data to be used for a fetch operation. - """ - def __init__(self, vcs, parent=None): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - @type Hg - @param parent reference to the parent widget - @type QWidget - """ - super(HgFetchDialog, self).__init__(parent) - self.setupUi(self) - - self.__vcs = vcs - - commitMessages = self.__vcs.getPlugin().getPreferences('Commits') - self.recentComboBox.clear() - self.recentComboBox.addItem("") - for message in commitMessages: - abbrMsg = message[:60] - if len(message) > 60: - abbrMsg += "..." - self.recentComboBox.addItem(abbrMsg, message) - - @pyqtSlot(str) - def on_recentComboBox_activated(self, txt): - """ - Private slot to select a commit message from recent ones. - - @param txt text of the selected entry (string) - """ - if txt: - self.messageEdit.setPlainText(self.recentComboBox.currentData()) - - def getData(self): - """ - Public method to get the data for the fetch operation. - - @return tuple with the commit message and a flag indicating to switch - the merge order (string, boolean) - """ - msg = self.messageEdit.toPlainText() - if msg: - commitMessages = self.__vcs.getPlugin().getPreferences('Commits') - if msg in commitMessages: - commitMessages.remove(msg) - commitMessages.insert(0, msg) - no = self.__vcs.getPlugin().getPreferences("CommitMessages") - del commitMessages[no:] - self.__vcs.getPlugin().setPreferences( - 'Commits', commitMessages) - - return msg, self.switchCheckBox.isChecked()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgFetchDialog</class> - <widget class="QDialog" name="HgFetchDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle"> - <string>Fetch Changes</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Commit Message</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QPlainTextEdit" name="messageEdit"> - <property name="toolTip"> - <string>Enter commit message or leave empty to use the default message</string> - </property> - <property name="tabChangesFocus"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Recent commit messages</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="recentComboBox"> - <property name="toolTip"> - <string>Select a recent commit message to use</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="switchCheckBox"> - <property name="toolTip"> - <string>Select to switch the merge order</string> - </property> - <property name="text"> - <string>Switch Parents when Merging</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>messageEdit</tabstop> - <tabstop>recentComboBox</tabstop> - <tabstop>switchCheckBox</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgFetchDialog</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>HgFetchDialog</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/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the fetch extension project helper. -""" - - -from PyQt5.QtWidgets import QMenu - -from E5Gui.E5Action import E5Action -from E5Gui import E5MessageBox - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - -import UI.PixmapCache - - -class FetchProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the fetch extension project helper. - """ - def __init__(self): - """ - Constructor - """ - super(FetchProjectHelper, self).__init__() - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgFetchAct = E5Action( - self.tr('Fetch changes'), - UI.PixmapCache.getIcon("vcsUpdate"), - self.tr('Fetch changes'), - 0, 0, self, 'mercurial_fetch') - self.hgFetchAct.setStatusTip(self.tr( - 'Fetch changes from a remote repository' - )) - self.hgFetchAct.setWhatsThis(self.tr( - """<b>Fetch changes</b>""" - """<p>This pulls changes from a remote repository into the """ - """local repository. If the pulled changes add a new branch""" - """ head, the head is automatically merged, and the result of""" - """ the merge is committed. Otherwise, the working directory""" - """ is updated to include the new changes.</p>""" - )) - self.hgFetchAct.triggered.connect(self.__hgFetch) - self.actions.append(self.hgFetchAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu (QMenu) - @return populated menu (QMenu) - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("vcsUpdate")) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgFetchAct) - - menu.aboutToShow.connect(self.__aboutToShowMenu) - - return menu - - def __aboutToShowMenu(self): - """ - Private slot to handle the aboutToShow signal of the background menu. - """ - self.hgFetchAct.setEnabled(self.vcs.canPull()) - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu (string) - """ - return self.tr("Fetch") - - def __hgFetch(self): - """ - Private slot used to fetch changes from a remote repository. - """ - shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch( - self.project.getProjectPath()) - if shouldReopen: - res = E5MessageBox.yesNo( - None, - self.tr("Fetch"), - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True) - if res: - self.project.reopenProject()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/__init__.py Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the fetch extension support interface. -"""
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py Fri Aug 28 19:34:39 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the fetch extension interface. -""" - - -import os - -from PyQt5.QtWidgets import QDialog - -from ..HgExtension import HgExtension -from ..HgDialog import HgDialog - - -class Fetch(HgExtension): - """ - Class implementing the fetch extension interface. - """ - def __init__(self, vcs): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - """ - super(Fetch, self).__init__(vcs) - - self.__vcs = vcs - - def hgFetch(self, name, revisions=None): - """ - Public method to fetch changes from a remote repository. - - @param name directory name of the project to be fetched to - @type str - @param revisions list of revisions to be pulled - @type list of str - @return flag indicating, that the update contained an add - or delete - @rtype bool - """ - # find the root of the repo - repodir = self.vcs.splitPath(name)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return False - - from .HgFetchDialog import HgFetchDialog - res = False - dlg = HgFetchDialog(self.__vcs) - if dlg.exec_() == QDialog.Accepted: - message, switchParent = dlg.getData() - - args = self.vcs.initCommand("fetch") - if message != "": - args.append("--message") - args.append(message) - if switchParent: - args.append("--switch-parent") - args.append("-v") - if revisions: - for rev in revisions: - args.append("--rev") - args.append(rev) - - dia = HgDialog( - self.tr('Fetching from a remote Mercurial repository'), - self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Fri Aug 28 19:50:22 2020 +0200 @@ -19,7 +19,7 @@ class Gpg(HgExtension): """ - Class implementing the fetch extension interface. + Class implementing the gpg extension interface. """ def __init__(self, vcs): """ @@ -33,7 +33,7 @@ def shutdown(self): """ - Public method used to shutdown the fetch interface. + Public method used to shutdown the gpg interface. """ if self.gpgSignaturesDialog is not None: self.gpgSignaturesDialog.close()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Aug 28 19:50:22 2020 +0200 @@ -97,7 +97,7 @@ self.__hasAddOrDelete = False if ( - args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", + args[0] in ["qpush", "qpop", "qgoto", "rebase", "update", "import", "revert", "graft", "shelve", "unshelve", "strip", "histedit"] or (args[0] in ["pull", "unbundle"] and
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 28 19:50:22 2020 +0200 @@ -319,10 +319,6 @@ self.tr("Pull Large Files"), self.__lfPullActTriggered) self.__lfPullAct.setToolTip(self.tr( "Pull large files for selected revisions")) - self.__fetchAct = self.__actionsMenu.addAction( - self.tr("Fetch Changes"), self.__fetchActTriggered) - self.__fetchAct.setToolTip(self.tr( - "Fetch changes from a remote repository")) self.__actionsMenu.addSeparator() @@ -1449,21 +1445,16 @@ if selectedIncomingItemsCount > 0: self.__pullAct.setText(self.tr("Pull Selected Changes")) - self.__fetchAct.setText(self.tr("Fetch Selected Changes")) else: self.__pullAct.setText(self.tr("Pull Changes")) - self.__fetchAct.setText(self.tr("Fetch Changes")) if self.vcs.canPull(): self.__pullAct.setEnabled(True) self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedItemsCount > 0) - self.__fetchAct.setEnabled( - self.vcs.isExtensionActive("fetch")) else: self.__pullAct.setEnabled(False) self.__lfPullAct.setEnabled(False) - self.__fetchAct.setEnabled(False) if self.vcs.canPush(): self.__pushAct.setEnabled( @@ -1524,7 +1515,6 @@ act.setEnabled(False) self.__pullAct.setText(self.tr("Pull Selected Changes")) - self.__fetchAct.setText(self.tr("Fetch Selected Changes")) if self.vcs.canPull() and not bool(self.__bundle): selectedIncomingItemsCount = len([ itm for itm in self.logTree.selectedItems() @@ -1534,13 +1524,9 @@ self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedIncomingItemsCount > 0) - self.__fetchAct.setEnabled( - self.vcs.isExtensionActive("fetch") and - selectedIncomingItemsCount > 0) else: self.__pullAct.setEnabled(False) self.__lfPullAct.setEnabled(False) - self.__fetchAct.setEnabled(False) self.__unbundleAct.setEnabled(bool(self.__bundle)) @@ -1550,7 +1536,7 @@ for act in [self.__phaseAct, self.__graftAct, self.__mergeAct, self.__tagAct, self.__closeHeadsAct, self.__switchAct, self.__bookmarkAct, self.__bookmarkMoveAct, - self.__pullAct, self.__lfPullAct, self.__fetchAct, + self.__pullAct, self.__lfPullAct, self.__stripAct, self.__gpgSignAct, self.__gpgVerifyAct, self.__unbundleAct]: act.setEnabled(False) @@ -2151,41 +2137,6 @@ self.repodir, revisions=revs) @pyqtSlot() - def __fetchActTriggered(self): - """ - Private slot to fetch changes from a remote repository. - """ - shouldReopen = False - refresh = False - addNext = False - - if self.initialCommandMode in ("log", "full_log", "incoming"): - revs = [] - for itm in [item for item in self.logTree.selectedItems() - if item.data(0, self.__incomingRole)]: - rev = itm.text(self.RevisionColumn).split(":")[1].strip() - if rev: - revs.append(rev) - shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch( - self.repodir, revisions=revs) - refresh = True - if self.initialCommandMode == "incoming": - addNext = True - if shouldReopen: - res = E5MessageBox.yesNo( - None, - self.tr("Fetch Changes"), - self.tr( - """The project should be reread. Do this now?"""), - yesDefault=True) - if res: - e5App().getObject("Project").reopenProject() - return - - if refresh: - self.on_refreshButton_clicked(addNext=addNext) - - @pyqtSlot() def __pullActTriggered(self): """ Private slot to pull changes from a remote repository.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Fri Aug 28 19:50:22 2020 +0200 @@ -121,12 +121,6 @@ ################################################################### if "extensions" not in self.__config: self.__config["extensions"] = {} - if self.fetchCheckBox.isChecked(): - self.__config["extensions"]["fetch"] = "" - else: - if "fetch" in self.__config["extensions"]: - del self.__config["extensions"]["fetch"] - self.__config["extensions"]["#fetch"] = "" if self.gpgCheckBox.isChecked(): self.__config["extensions"]["gpg"] = "" @@ -331,8 +325,6 @@ # step 2: extract extensions information if "extensions" in self.__config: - self.fetchCheckBox.setChecked( - "fetch" in self.__config["extensions"]) self.gpgCheckBox.setChecked( "gpg" in self.__config["extensions"]) self.purgeCheckBox.setChecked( @@ -459,7 +451,6 @@ self.userNameEdit.clear() self.emailEdit.clear() - self.fetchCheckBox.setChecked(False) self.gpgCheckBox.setChecked(False) self.purgeCheckBox.setChecked(False) self.queuesCheckBox.setChecked(False)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri Aug 28 19:50:22 2020 +0200 @@ -131,16 +131,6 @@ </widget> </item> <item row="0" column="1"> - <widget class="QCheckBox" name="fetchCheckBox"> - <property name="toolTip"> - <string>Select to activate the fetch extension</string> - </property> - <property name="text"> - <string>Fetch</string> - </property> - </widget> - </item> - <item row="1" column="0"> <widget class="QCheckBox" name="gpgCheckBox"> <property name="toolTip"> <string>Select to activate the GPG extension</string> @@ -150,7 +140,7 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="1" column="0"> <widget class="QCheckBox" name="histeditCheckBox"> <property name="toolTip"> <string>Select to activate the histedit extension</string> @@ -160,7 +150,7 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="1" column="1"> <widget class="QCheckBox" name="largefilesCheckBox"> <property name="toolTip"> <string>Select to activate the largefiles extension</string> @@ -170,7 +160,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="2" column="0"> <widget class="QCheckBox" name="purgeCheckBox"> <property name="toolTip"> <string>Select to activate the Purge extension</string> @@ -180,7 +170,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="2" column="1"> <widget class="QCheckBox" name="queuesCheckBox"> <property name="toolTip"> <string>Select to activate the queues extension</string> @@ -190,7 +180,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="3" column="0"> <widget class="QCheckBox" name="rebaseCheckBox"> <property name="toolTip"> <string>Select to activate the rebase extension</string> @@ -200,7 +190,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="3" column="1"> <widget class="QCheckBox" name="shelveCheckBox"> <property name="toolTip"> <string>Select to activate the shelve extension</string> @@ -210,7 +200,7 @@ </property> </widget> </item> - <item row="4" column="1"> + <item row="4" column="0"> <widget class="QCheckBox" name="stripCheckBox"> <property name="toolTip"> <string>Select to activate the strip extension</string> @@ -683,15 +673,6 @@ <tabstop>userNameEdit</tabstop> <tabstop>emailEdit</tabstop> <tabstop>closeheadCheckBox</tabstop> - <tabstop>fetchCheckBox</tabstop> - <tabstop>gpgCheckBox</tabstop> - <tabstop>histeditCheckBox</tabstop> - <tabstop>largefilesCheckBox</tabstop> - <tabstop>purgeCheckBox</tabstop> - <tabstop>queuesCheckBox</tabstop> - <tabstop>rebaseCheckBox</tabstop> - <tabstop>shelveCheckBox</tabstop> - <tabstop>stripCheckBox</tabstop> <tabstop>lfFileSizeSpinBox</tabstop> <tabstop>lfFilePatternsEdit</tabstop> <tabstop>lfUserCachePicker</tabstop>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Aug 28 19:50:22 2020 +0200 @@ -40,7 +40,6 @@ # instantiate the extensions from .QueuesExtension.ProjectHelper import QueuesProjectHelper - from .FetchExtension.ProjectHelper import FetchProjectHelper from .PurgeExtension.ProjectHelper import PurgeProjectHelper from .GpgExtension.ProjectHelper import GpgProjectHelper from .RebaseExtension.ProjectHelper import RebaseProjectHelper @@ -51,7 +50,6 @@ from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper self.__extensions = { "mq": QueuesProjectHelper(), - "fetch": FetchProjectHelper(), "purge": PurgeProjectHelper(), "gpg": GpgProjectHelper(), "rebase": RebaseProjectHelper(),
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Aug 28 19:50:22 2020 +0200 @@ -137,7 +137,6 @@ # instantiate the extensions from .QueuesExtension.queues import Queues - from .FetchExtension.fetch import Fetch from .PurgeExtension.purge import Purge from .GpgExtension.gpg import Gpg from .RebaseExtension.rebase import Rebase @@ -148,7 +147,6 @@ from .CloseheadExtension.closehead import Closehead self.__extensions = { "mq": Queues(self), - "fetch": Fetch(self), "purge": Purge(self), "gpg": Gpg(self), "rebase": Rebase(self),
--- a/eric6/i18n/eric6_cs.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_cs.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2415,7 +2415,7 @@ <translation>Jméno</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Atributy</translation> </message> @@ -2430,7 +2430,7 @@ <translation>Kódování: {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -18519,38 +18519,13 @@ </context> <context> <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>FetchProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + <translation type="obsolete">Projekt bude znovu načten. Má se provést?</translation> </message> </context> <context> @@ -30532,307 +30507,307 @@ <translation type="obsolete">hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <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="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <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="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <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="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <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="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <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="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <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="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> @@ -30842,132 +30817,132 @@ <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -32534,41 +32509,6 @@ </context> <context> <name>HgFetchDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> - <source>Commit Message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> - <source>Recent commit messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> - <source>Select a recent commit message to use</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>HgGpgSignDialog</name> @@ -33414,7 +33354,7 @@ <translation type="obsolete">Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -33485,12 +33425,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -33515,7 +33455,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> @@ -33535,7 +33475,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33580,12 +33520,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -33610,7 +33550,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -33620,42 +33560,32 @@ <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -33680,27 +33610,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33745,118 +33675,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> @@ -33866,7 +33791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -34363,1452 +34288,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <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="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <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="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -38178,22 +38103,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -38249,286 +38174,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"> MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished">Síť</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished">Host:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation type="unfinished">Host:</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished">Heslo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished">Bezpečnost</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -38553,12 +38468,12 @@ <translation type="unfinished">Výchozí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -90561,46 +90476,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -90608,12 +90523,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90624,13 +90539,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_de.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_de.ts Fri Aug 28 19:50:22 2020 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -2053,8 +2052,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="171"/> - <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="../WebBrowser/Bookmarks/BookmarksMenu.py" line="175"/> @@ -2122,8 +2121,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <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="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="95"/> @@ -2378,7 +2377,7 @@ <translation>Name</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Attribute</translation> </message> @@ -2393,7 +2392,7 @@ <translation>Globale Variablen</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>Klassenattribute</translation> </message> @@ -17904,42 +17903,6 @@ </message> </context> <context> - <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation>Fetch von einem entfernten Mercurial-Repository</translation> - </message> -</context> -<context> - <name>FetchProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation>Änderungen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter. Wenn die heruntergeladenen Änderungen einen neuen Kopf erzeugen, so werden die Köpfe automatisch zusammengeführt und das Ergebnis eingepflegt. Abschließend wird das Arbeitsverzeichnis mit den neuen Änderungen aktualisiert.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation>Fetch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>The project should be reread. Do this now?</source> - <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> - </message> -</context> -<context> <name>FileDialogWizard</name> <message> <location filename="../Plugins/PluginWizardQFileDialog.py" line="158"/> @@ -27932,437 +27895,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <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="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <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="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <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="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <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="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <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="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <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="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <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="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation>Markiere als 'nicht aufgelöst'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> @@ -29791,44 +29754,6 @@ </message> </context> <context> - <name>HgFetchDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation>Änderungen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> - <source>Commit Message</source> - <translation>Änderungsbeschreibung</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation>Gib die Änderungsbeschreibung ein oder lasse das Feld leer, um den Standardtext zu verwenden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> - <source>Recent commit messages</source> - <translation>Letzte Änderungsbeschreibungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> - <source>Select a recent commit message to use</source> - <translation>Wähle eine zu verwendende Änderungsbeschreibung</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation>Auswählen, um die Reihenfolge des Zusammenführens umzudrehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation>Eltern für Zusammenführen vertauschen</translation> - </message> -</context> -<context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="23"/> @@ -30592,7 +30517,7 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -30663,12 +30588,12 @@ <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -30693,7 +30618,7 @@ <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation>Umschalten</translation> </message> @@ -30713,7 +30638,7 @@ <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -30758,12 +30683,12 @@ <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> @@ -30788,7 +30713,7 @@ <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> @@ -30798,42 +30723,32 @@ <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation>Ausgewählte Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation>Alle Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation>Änderungen abholen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation>Änderungssätze löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation>Änderungssätze aus einem Repository löschen</translation> </message> @@ -30858,27 +30773,27 @@ <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz "{0}" verschoben werden soll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation> </message> @@ -30923,119 +30838,114 @@ <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für die ausgewählten Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Änderungsgruppe erzeugen</b> <p>Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation>Wende die aktuell inspizierte Änderungsgruppendatei an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation>Revisionen signieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation>Den ausgewählten Revisionen eine Signatur hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation>Diff zu Vorgänger {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> @@ -31045,7 +30955,7 @@ <translation><a href="save:me">Speichern</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> @@ -31548,1452 +31458,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Erzeuge (klone) ein neues Projekt aus einem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Neu aus Repository</b><p>Dies erzeugt (clone) ein neues Projekt aus dem Mercurial-Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Zeige das Log eingehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zeige eingehendes Log</b><p>Dies zeigt das Log von Änderungen, die in das Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>&Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Abgleich des lokalen Projektes mit dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Abgleich mit Repository</b><p>Dies gleicht das lokale Projekt mit dem Mercurial-Repository ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Änderungen in Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>&Änderungen in Repository einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Änderungen am lokalen Projekt in das Mercurial-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Mercurial-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Zeige das Log ausgehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zeige ausgehendes Log</b><p>Dies zeigt das Log von Änderungen, die aus dem Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Änderungen hochladen</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>Änderungen &zusammenführen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Verfiziert die Integrität des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <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="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Als „gut“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Als „schlecht“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <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="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation>Änderungen an ein entferntes Repository mit der Option „force“ hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <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="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <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="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <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="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation>Phase ändern...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation>Ändert die Phase von Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation>Kopiersitzung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation>Status an&zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation>Übersichtsinformationen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation>Übersichtsinformationen anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation>Zeige Übersichtsinformationen zum Status des Arbeitsverzeichnisses</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <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="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation>Lesezeichen löschen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation>Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation>Lesezeichen umbenennen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation>Zeige eingehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation>Zeige Konflikte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation>Zeige Konflikte...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation>Zeige einen Dialog mit allen Dateien mit Konflikten an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation>Konflikte ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Löscht alle Backupdateien im Backupbereich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Alle Backups löschen</b><p>Dies löscht alle Backupdateien im Backupbereich des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation>Kopiersitzung anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation>Hält die unterbrochene Kopiersitzung an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation>Kopiersitzung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation>Bricht die unterbrochene Kopiersitzung ab und rollt sie zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die unterbrochene Kopiersitzung ab und rollt sie auf den Zustand vor dem Kopieren zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Kopiersitzung anhalten</b><p>Dies hält die unterbrochene Kopiersitzung an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation>Zusammengeführte Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Zusammengeführte Änderungen einpflegen</b><p>Dies pflegt ein Arbeitsverzeichnis mit zusammengeführten Änderungen ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation>Alle zusammengeführten Änderungen einpflegen.</translation> </message> @@ -35205,22 +35115,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation>Fingerabdruck löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Soll der Fingerabdruck für den Host <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Sie werden alle Änderungen, die in diesem Dialog vorgenommen wurden, verlieren. Sollen die Daten vorher gesichert werden?</translation> </message> @@ -35276,286 +35186,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> - <translation>Auswählen, um die Fetch Erweiterung zu aktivieren</translation> + <source>Select to activate the GPG extension</source> + <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation>Fetch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation>GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation>Auswählen, um die Erweiterung für große Dateien zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation>Große Dateien</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation>Auswählen, um die Erweiterung für große Dateien zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> - <translation>Große Dateien</translation> + <source>Select to activate the Purge extension</source> + <translation>Auswählen, um die Purge Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> + <translation>Purge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> - <translation>Auswählen, um die Purge Erweiterung zu aktivieren</translation> + <source>Select to activate the queues extension</source> + <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> - <translation>Purge</translation> + <source>Queues</source> + <translation>Patchschlangen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> - <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> + <source>Select to activate the rebase extension</source> + <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> - <translation>Patchschlangen</translation> + <source>Rebase</source> + <translation>Umgruppieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> - <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> + <source>Select to activate the shelve extension</source> + <translation>Auswählen, um die Ablage (Shelve) Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation>Umgruppieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation>Auswählen, um die Ablage (Shelve) Erweiterung zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation>Mindestdateigröße:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation>Gib die Mindestdateigröße in MB ein, ab der Dateien als große Dateien betrachtet werden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation> MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation>Muster:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation>Gib die Dateimuster (durch Leerzeichen getrennt) für große Dateien ein</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> - <translation>Muster:</translation> + <source>Enter file patterns for large files</source> + <translation>Dateimuster für große Dateien eingeben</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation>Gib die Dateimuster (durch Leerzeichen getrennt) für große Dateien ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation>Dateimuster für große Dateien eingeben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation>Nutzercache:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation>Gib den Namen des nutzerbezogenen Cacheverzeichnisses ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation>Rechner:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation>Gib den Namen des Netzwerkproxyrechners ein</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation>Rechner:</translation> + <source>Enter Proxy Hostname</source> + <translation>Name des Proxyrechners eingeben</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation>Gib den Namen des Netzwerkproxyrechners ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> - <translation>Name des Proxyrechners eingeben</translation> + <source>User:</source> + <translation>Nutzer:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> + <translation>Gib den Nutzernamen für den Netzwerkproxy ein</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> - <translation>Nutzer:</translation> + <source>Enter Proxy Username</source> + <translation>Nutzername für Proxy eingeben</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation>Gib den Nutzernamen für den Netzwerkproxy ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation>Nutzername für Proxy eingeben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation>Kennwort:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation>Gib das Kennwort für den Netzwerkproxy ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation>Kennwort für Proxy eingeben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation>Ausnahmen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation>Gib die Namen der Hosts durch Komma getrennt an, die den Proxy umgehen können</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation>Hostnamen durch Komma getrennt eingeben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation>Fingerabdrücke</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation>Rechner</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation>Fingerabdruck</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation>Fingerabdruck</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation>Einen Fingerabdruck hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation>Einen Fingerabdruck löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation>Einen Fingerabdruck bearbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation>Öffnet die Konfigurationsdatei des Nutzers in einem Texteditor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation>Konfigurationsdatei in Editor öffnen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation>Auswählen, um die Strip Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation>Strip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation>Auswählen, um die Histedit Erweiterung zu aktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation>Histedit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation>Sicherheit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation>TLS 1.0 Warnung deaktivieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation>Minimales Protokoll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation>Wähle das minimal zu verwendende Protokoll aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation>Minimales Protokoll pro Host</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation>Minimales Protokoll</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation>Minimales Protokoll</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation>Einen Eintrag für ein minimales Protokoll hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation>Einen Eintrag für ein minimales Protokoll löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation>Einen Eintrag für ein minimales Protokoll bearbeiten</translation> </message> @@ -35580,12 +35480,12 @@ <translation>Standard</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation>Eintrag für ein minimales Protokoll löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Solle der Eintrag für ein minimales Protokoll des Host <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> @@ -44295,12 +44195,12 @@ </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1051"/> - <source>µPy Chart</source> + <source>µPy Chart</source> <translation>µPy Chart</translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1131"/> - <source>µPy Files</source> + <source>µPy Files</source> <translation>µPy Dateien</translation> </message> <message> @@ -84267,8 +84167,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="676"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="682"/> @@ -87047,24 +86947,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -87073,24 +86973,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -87101,12 +87001,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87117,14 +87017,14 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_empty.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_empty.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2370,12 +2370,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -17779,42 +17779,6 @@ </message> </context> <context> - <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>FetchProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>FileDialogWizard</name> <message> <location filename="../Plugins/PluginWizardQFileDialog.py" line="85"/> @@ -27764,437 +27728,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -29599,44 +29563,6 @@ </message> </context> <context> - <name>HgFetchDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> - <source>Commit Message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> - <source>Recent commit messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> - <source>Select a recent commit message to use</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="23"/> @@ -30515,7 +30441,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -30551,7 +30477,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -30561,7 +30487,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -30581,67 +30507,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -30666,27 +30582,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -30731,118 +30647,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -30852,7 +30763,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -31349,1452 +31260,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -34988,22 +34899,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -35059,286 +34970,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> + <source>Enter Proxy Hostname</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -35363,12 +35264,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -86356,35 +86257,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -86395,35 +86296,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/eric6/i18n/eric6_en.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_en.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2365,12 +2365,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -17794,42 +17794,6 @@ </message> </context> <context> - <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>FetchProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>FileDialogWizard</name> <message> <location filename="../Plugins/PluginWizardQFileDialog.py" line="85"/> @@ -27786,437 +27750,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -29621,44 +29585,6 @@ </message> </context> <context> - <name>HgFetchDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> - <source>Commit Message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> - <source>Recent commit messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> - <source>Select a recent commit message to use</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="23"/> @@ -30442,7 +30368,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -30493,12 +30419,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -30523,7 +30449,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -30543,7 +30469,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -30588,12 +30514,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -30618,7 +30544,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -30628,42 +30554,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -30688,27 +30604,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -30753,118 +30669,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -30874,7 +30785,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -31371,1452 +31282,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -35020,22 +34931,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -35091,286 +35002,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> + <source>Enter Proxy Hostname</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -35395,12 +35296,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -86406,46 +86307,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -86453,12 +86354,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -86469,13 +86370,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_es.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_es.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2374,7 +2374,7 @@ <translation>Nombre</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Atributos</translation> </message> @@ -2389,7 +2389,7 @@ <translation>Codificación: {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation></translation> </message> @@ -17909,7 +17909,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> <source>Fetching from a remote Mercurial repository</source> - <translation>Recuperando desde un repositorio remoto Mercurial</translation> + <translation type="obsolete">Recuperando desde un repositorio remoto Mercurial</translation> </message> </context> <context> @@ -17917,27 +17917,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> <source>Fetch changes</source> - <translation>Fetch (recuperación) de cambios</translation> + <translation type="obsolete">Fetch (recuperación) de cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> <source>Fetch changes from a remote repository</source> - <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> + <translation type="obsolete">Fetch (recuperación) de cambios desde un repositorio remoto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation><b>Fetch (recuperación) de cambios</b><p>Trae los cambios de un repositorio remoto al repositorio local. Si los cambios traidos añaden una nueva branch head, se hace automáticamente un merge de la head, y al resultado del merge se le aplica commit. De cualquier otro modo, el directorio de trabajo se actualiza para incluir los nuevos cambios.</p></translation> + <translation type="obsolete"><b>Fetch (recuperación) de cambios</b><p>Trae los cambios de un repositorio remoto al repositorio local. Si los cambios traidos añaden una nueva branch head, se hace automáticamente un merge de la head, y al resultado del merge se le aplica commit. De cualquier otro modo, el directorio de trabajo se actualiza para incluir los nuevos cambios.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>Fetch</source> - <translation>Fetch</translation> + <translation type="obsolete">Fetch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + <translation type="obsolete">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> </context> <context> @@ -27933,437 +27933,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <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="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <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="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <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="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <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="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <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="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation>¿Desea realmente hacer un re-merge del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation>Marcando como 'unresolved'</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation>Marcando como 'unresolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation>Abortando merge sin commit</translation> </message> @@ -29796,37 +29796,37 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> <source>Fetch Changes</source> - <translation>Recuperar Cambios</translation> + <translation type="obsolete">Recuperar Cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation>Mensaje de Commit</translation> + <translation type="obsolete">Mensaje de Commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> <source>Enter commit message or leave empty to use the default message</source> - <translation>Introduzca el mensaje de commit o deje en blanco para utilizar el mensaje por defecto</translation> + <translation type="obsolete">Introduzca el mensaje de commit o deje en blanco para utilizar el mensaje por defecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation>Mensajes recientes de commit</translation> + <translation type="obsolete">Mensajes recientes de commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation>Seleccione un mensaje de commit reciente para utilizar</translation> + <translation type="obsolete">Seleccione un mensaje de commit reciente para utilizar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> <source>Select to switch the merge order</source> - <translation>Seleccionar para cambiar el orden de merge</translation> + <translation type="obsolete">Seleccionar para cambiar el orden de merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> <source>Switch Parents when Merging</source> - <translation>Cambiar Padres al hacer Merge</translation> + <translation type="obsolete">Cambiar Padres al hacer Merge</translation> </message> </context> <context> @@ -30593,7 +30593,7 @@ <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -30665,12 +30665,12 @@ <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -30695,7 +30695,7 @@ <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation>Hacer switch</translation> </message> @@ -30715,7 +30715,7 @@ <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> @@ -30760,12 +30760,12 @@ <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> @@ -30790,7 +30790,7 @@ <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> @@ -30800,42 +30800,42 @@ <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation>Hacer Push de Todos los Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation>Hacer push de todos los cambios a un repositorio remoto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> <source>Fetch Changes</source> - <translation>Fetch (recuperación) de cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <translation type="obsolete">Fetch (recuperación) de cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>Fetch changes from a remote repository</source> - <translation>Fetch (recuperación) de cambios desde un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <translation type="obsolete">Fetch (recuperación) de cambios desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation>Hacer strip de changesets desde un repositorio remoto</translation> </message> @@ -30860,27 +30860,27 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> @@ -30925,119 +30925,119 @@ <translation>Hacer merge del directorio de trabajo con el changeset seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation>Crear Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation>Crear un archivo de changegroup conteniendo los changesets seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Crear Changegroup</b> <p>Esto crea un archivo de changegroup que contiene las revisiones seleccionadas. Si no se han seleccionado revisiones, se incluirán todos los changesets. Si se ha seleccionado una revisión, se tomará como revisión base. En cualquier otro lugar, la revisión más baja se usará como revisión base y todas las otras revisiones se incluirán en el archivo. Si el diálogo muestra changesets salientes, todos los changesets seleccionados se incluirán en el archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation>Aplicar el archivo de changegroup mostrado actualmente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation>Firmar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation>Añadir una firma para las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation>Verificar Firmas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation>Seleccionar Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Mostrar Diff lado a lado con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparar lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> <source>Fetch Selected Changes</source> - <translation>Hacer Fetch de Cambios Seleccionados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <translation type="obsolete">Hacer Fetch de Cambios Seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation>Diff con el Parent {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> @@ -31047,7 +31047,7 @@ <translation><a href="save:me">Guardar</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> @@ -31550,1452 +31550,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Nuevo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Mostrar log entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Mostrar el log de los cambios entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Hacer pull de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Hacer update desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>Hacer &update desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Actualizar el proyecto local desde el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Hacer commit de los cambios al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>Hacer &commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Hacer commit de los cambios al repositorio</b><p>Envía los cambios del proyecto local al repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Mostrar log saliente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Mostrar el log de los cambios salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Hacer push de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Hacer push de cambios hacia un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>Re&vertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Listar tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Lista las branches del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Crear branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Crear &branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Verificar la integridad del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Crear un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <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="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <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="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation>Hacer push de cambios (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <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="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <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="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation>Exportar revisiones a archivos de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation>Cambiar la fase de revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation>Con&flictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation>Mostrar Sumario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation>Mostrar Sumario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation>Mostrar información sumarial del estado del directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <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="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation>Define un marcador para el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation>Borrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation>Borrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation>Borrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation>Renombrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation>Renombrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation>Renombrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation>Mover un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation>Pull de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation>Mostrar conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation>Mostrar conflictos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation>Detener la Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation>Detener la sesión de copia interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation>Abortar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation>Abortar la sesión interrumpida de copia y hacer rollback</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation>Hacer Merge de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation>Commit Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Hacer commit de un merge</b><p>Ejecuta un commit de un directorio de trabajo en merge</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation>Abortar Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation>Abortar un merge sin commit y perder todos los cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Abortar merge sin commit</b><p>Aborta un merge sin commit causando que se pierdan todos los cambios.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation>Hacer commit de los cambios con merge.</translation> </message> @@ -35207,22 +35207,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation>Borrar Fingerprint del Host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>¿Está seguro de eliminar el fingerprint para el host <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation>Editar Configuración de Usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Van a perderse todos los cambios hechos en este diálogo. ¿Desea guardar los estos datos?</translation> </message> @@ -35279,285 +35279,285 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the fetch extension</source> - <translation>Seleccionar para activar la extensión fetch</translation> + <translation type="obsolete">Seleccionar para activar la extensión fetch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>Fetch</source> - <translation>Fetch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <translation type="obsolete">Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the GPG extension</source> <translation>Seleccionar para activar la extensión GPG</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>GPG</source> <translation>GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation>Seleccionar para activar la extensión de archivos grandes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation>Archivos Grandes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation>Seleccionar para activar la extensión de archivos grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> - <translation>Archivos Grandes</translation> + <source>Select to activate the Purge extension</source> + <translation>Seleccionar para activar la extensión purge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> + <translation>Purge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> - <translation>Seleccionar para activar la extensión purge</translation> + <source>Select to activate the queues extension</source> + <translation>Seleccionar para activar la extensión queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> - <translation>Purge</translation> + <source>Queues</source> + <translation>Queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> - <translation>Seleccionar para activar la extensión queues</translation> + <source>Select to activate the rebase extension</source> + <translation>Seleccionar para activar la extensión rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> - <translation>Queues</translation> + <source>Rebase</source> + <translation>Rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> - <translation>Seleccionar para activar la extensión rebase</translation> + <source>Select to activate the shelve extension</source> + <translation>Seleccionar para activar la extensión shelve</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation>Rebase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation>Seleccionar para activar la extensión shelve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation>Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation>Tamaño mínimo de archivo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation>Introducir el tamaño mínimo de archivo en MB para que los archivos sean tratados como Archivos Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation> MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation>Patrones:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation>Introducir patrones de archivo (separados por espacios) para que los archivos sean tratados como Archivos Grandes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> - <translation>Patrones:</translation> + <source>Enter file patterns for large files</source> + <translation>Introducir patrones de archivo para archivos grandes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation>Introducir patrones de archivo (separados por espacios) para que los archivos sean tratados como Archivos Grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation>Introducir patrones de archivo para archivos grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation>Caché de Usuario:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation>Introducir el nombre del directorio para caché de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation>Host:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation>Introducir el nombre del host proxy para la red</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation>Host:</translation> + <source>Enter Proxy Hostname</source> + <translation>Introducir nombre de Host del Proxy</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation>Introducir el nombre del host proxy para la red</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> - <translation>Introducir nombre de Host del Proxy</translation> + <source>User:</source> + <translation>Usuario:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> + <translation>Introducir el nombre de usuario para el proxy de la red</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> - <translation>Usuario:</translation> + <source>Enter Proxy Username</source> + <translation>Introducir Nombre de Usuario para el Proxy</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation>Introducir el nombre de usuario para el proxy de la red</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation>Introducir Nombre de Usuario para el Proxy</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation>Contraseña:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation>Introducir la contraseña para el proxy de la red</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation>Introducir Contraseña para el Proxy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation>Bypass:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation>Introducir los nombres de hosts que pueden puentear el proxy de la red separados por commas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation>Introducir los hosts que puentean el proxy separados por comas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation>Fingerprints de Host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation>Host</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation>Fingerprint</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation>Fingerprint</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation>Añadir una entrada de fingerprint de host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation>Borrar una entrada de fingerprint de host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation>Editar una entrada de fingerprint de host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation>Abrir el archivo de configuración de usuario en un editor de texto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation>Abrir archivo de configuración en editor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation>Seleccionar para activar la extensión strip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation>Strip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation>Seleccionar para activar la extensión histedit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation>Histedit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation>Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation>Deshabilitar Advertencias para TLS 1.0</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation>Protocolo Mínimo:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation>Seleccionar el protocolo mínimo a utilizar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation>Protocolo mínimo por Host</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation>Protocolo Mínimo</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation>Protocolo Mínimo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation>Añadir una entrada de protocolo mínimo para host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation>Eliminar una entrada de protocolo mínimo para host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation>Editar una entrada de protocolo mínimo para host</translation> </message> @@ -35582,12 +35582,12 @@ <translation>Por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation>Borrar Protocolo Mínimo para Host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>¿Se debe realmente eliminar la entrada de protocolo mínimo para el host <b>{0}</b> ?</p></translation> </message> @@ -87127,17 +87127,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -87148,31 +87148,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -87181,12 +87181,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87203,14 +87203,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_fr.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_fr.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2438,7 +2438,7 @@ <translation>Nom</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Attributs</translation> </message> @@ -2453,7 +2453,7 @@ <translation>Codage: {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>Attributs de classe</translation> </message> @@ -18485,38 +18485,18 @@ </context> <context> <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>FetchProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> <source>Fetch changes</source> - <translation>Chercher les modifications</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Chercher les modifications</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation>Le projet devrai être relu. Le faire maintenant ?</translation> + <translation type="obsolete">Le projet devrai être relu. Le faire maintenant ?</translation> </message> </context> <context> @@ -29794,307 +29774,307 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Créer un répertoire projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Le répertoire projet n'a pu être créé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Création en cour d'un répertoire Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation>Commit initial vers le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonage du projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronisation en cours avec le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Ajouter des fichiers/dossier au dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Suppression en cours des fichiers/dossiers à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation type="unfinished">Renommage {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Fusion en cours</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Commande Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Copie en cours {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation>Création en cours d'une branche sur le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation>Faut-il mettre à jour le répertoire de travail ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Créer un fichier .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation>Supprimer les fichiers de dépot Mercurial uniquement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Ajouter un sous-dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished">Ce commit affecte des fichiers qui ont des modifications non enregistrées. Faut-il poursuivre le commit ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier <b>{0}</b> n'a pas pu être lu.</p></translation> </message> @@ -30104,132 +30084,132 @@ <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation>Nouvelle branche créée <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation>Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation>Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished">Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -31801,39 +31781,24 @@ <context> <name>HgFetchDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation>Message de commit</translation> + <translation type="obsolete">Message de commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> <source>Enter commit message or leave empty to use the default message</source> - <translation>Entrer le message de commit ou laisser vide pour utiliser la valeur par défaut</translation> + <translation type="obsolete">Entrer le message de commit ou laisser vide pour utiliser la valeur par défaut</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation>Messages de commit récents</translation> + <translation type="obsolete">Messages de commit récents</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation>Sélectionner un message de commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Sélectionner un message de commit</translation> </message> </context> <context> @@ -32670,7 +32635,7 @@ <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Erreur Mercurial</translation> </message> @@ -32741,12 +32706,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation>Le projet devrai être relu. Le faire maintenant ?</translation> </message> @@ -32771,7 +32736,7 @@ <translation>Étiquetter la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation>Basculer de version</translation> </message> @@ -32791,7 +32756,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -32836,12 +32801,12 @@ <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> @@ -32866,7 +32831,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -32876,42 +32841,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -32936,27 +32891,27 @@ <translation>Déplacer le signet vers la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33001,118 +32956,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier patch <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> </message> @@ -33122,7 +33072,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -33623,1452 +33573,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Nouveau à partir du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Nouveau depuis un référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Créer (clone) un nouveau projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nouvea à partir d'un dépot</b><p>Cela créé (clone) un nouveau projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Mise à jour à partir du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>Mettre à jo&ur à partir du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Mettre à jour le projet local à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Mettre à jour à partir d'un dépot</b><p>Cela mets à jour le projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>"Commiter" les modifications au référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>&Appliquer les changements dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Afficher les &différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>&Recharger le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Fusionne les modifications d'une révision dans le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Fusion</b><p>Cela fusionne les modifications d'une révision dans le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Lister les étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Liste les étiquettes du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Liste les branches du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Créer une branche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Créer une &branche...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Créer une nouvelle branche pour le projet local dans le dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Fermer la branche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Feme la branche courante du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fermer la branche</b><p>Ceci feme la branche courante du projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation type="unfinished">Basculer le répertoire de travail sur une autre version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Executer une commande Mercurial arbitraire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Exécuter une commande</b><p>Ceci ouvre une fenêtre pour saisir une commande arbitraire Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Montrer les chemins</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Montrer les chemins...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Vérifier le dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Vérifier le dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Vérifier l'intégrité du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Vérifier le dépot</b><p>Ceci vérifie l'intégrité du dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Créer le .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Créer un fichier .hgignore avec les valeurs par défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Créer le .hgignore</b><p>Créer un fichier .hgignore avec les valeurs par défaut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Montrer la branche courante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Montrer la branche courante du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Montrer la branche courante</b><p>Ceci montre la branche courante du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Marquer comme "bon"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Marquer comme "mauvais"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Marquer comme "bon"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Marquer comme "mauvais"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished">Extensions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation>Éditer la configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation>Éditer la configuration utilisateur...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Éditer la configuration utilisateur</b><p>Affiche un éditeur pour modifier le fichier de configuration utilisateur.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation>Éditer la configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation>Éditer la configuration du dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Éditer la configuration du dépot</b><p>Affiche un éditeur pour modifier le fichier de configuration du dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation>Passer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation>Importer un patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation>Importer un patch à partir d'un fichier patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importer un patch</b><p>Ceci importe un patch à partir d'un fichier patch dans le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation>Gestion de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation>Exporter les patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation>Exporter les patchs...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation>Exporter les révisions vers les fichiers patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exporter les patchs</b><p>Ceci exporte les révisions vers les fichiers patchs.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation>Conflits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation>Con&flits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Marquer tous les conflits du projet local comme résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflits résolus</b><p>Ceci marque tous les conflits du projet local comme résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation>Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation>Ajouter un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Ajouter...</b><p>Ajouter un sous-répertoire au projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation>Supprimer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation>Supprimer les sous-répertoires</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Supprimer...</b><p>Supprimer les sous-répertoires du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation>Sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation>Montrer les &statuts...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation>Montrer le bilan</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation>Montrer le bilan...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished">Afficher le bilan du statut du répertoire de travail</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation>Administration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation>Montrer les différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>Montrer les différences</b><p>Cela affiche les différences entre le projet local et le dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation>Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation>Lister les signets ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation>Lister les signets du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation>Définir signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation>Définir signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation>Définir un signet pour le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation>Supprimer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation>Supprimer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation>Supprimer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation>Renommer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation>Renommer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation>Renommer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation>Déplacer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation>Déplacer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation>Déplacer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation>Montrer nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation>Montrer la liste des nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation>Télécharger signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation>Télecharger un signet d'un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation>Montrer signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation>Montrer la list des signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation>Envoyer un signet dans un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation>Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation>Montrer les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation>Montrer les conflits...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation>Affiche une fenêtre listant tous les fichiers en conflit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation>Conflits non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marquer tous les conflits du projet local comme non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflits non résolus</b><p>Ceci marque tous les conflits du projet local comme non résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -37430,22 +37380,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation>Modifier la configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Vous allez perdre toutes les modifications faites dans cette fenêtre. Faut-il sauvegarder d'abord ?</translation> </message> @@ -37501,286 +37451,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation>GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished">Gros fichiers</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> - <translation type="unfinished">Gros fichiers</translation> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation>Taille de fichier minimum :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation>Hôte :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation>Hôte :</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> - <translation type="unfinished"></translation> + <source>User:</source> + <translation>Utilisateur :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> + <translation>Entrer le nom d'utilisateur pour le proxy réseau</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> - <translation>Utilisateur :</translation> + <source>Enter Proxy Username</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation>Entrer le nom d'utilisateur pour le proxy réseau</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation>Mot de passe :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation>Entrer le mot de passe pour le proxy réseau</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation>Hôte</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation>Ouvrir le fichier de configuration utilisateur dans un fichier texte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation>Ouvrir le fichier de configuration dans un éditeur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation>Sécurité</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation>Protocole minimum :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation>Sélectionner le protocole minimum à utiliser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation>Protocole minimum par hôte</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation>Protocole minimum</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation>Protocole minimum</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -37805,12 +37745,12 @@ <translation>Défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation>Supprimer le protocole minimum de l'hôte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Faut il vraiment supprimer le protocole minimum de l'hôte <b>{0}</b> ?</p></translation> </message> @@ -89755,24 +89695,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -89781,24 +89721,24 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -89809,12 +89749,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -89825,13 +89765,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_it.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_it.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2435,7 +2435,7 @@ <translation>Nome</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Attributi</translation> </message> @@ -2450,7 +2450,7 @@ <translation>Codifica: {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>Attributi della Classe</translation> </message> @@ -18867,7 +18867,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> <source>Fetching from a remote Mercurial repository</source> - <translation>Recupero da un repository Mercurial remoto</translation> + <translation type="obsolete">Recupero da un repository Mercurial remoto</translation> </message> </context> <context> @@ -18875,27 +18875,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> <source>Fetch changes</source> - <translation>Recupero modifiche</translation> + <translation type="obsolete">Recupero modifiche</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> <source>Fetch changes from a remote repository</source> - <translation>Recupero modifiche da un repository remoto</translation> + <translation type="obsolete">Recupero modifiche da un repository remoto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation><b>Recupero modifiche</b><p>Recupra le modifiche da un repository remoto in quello locale. Se le modifiche recuperate aggiungono un nuovo ramo, il ramo è automaticamente inserito, e l'inserimento viene consolidato. Altrimenti la cartella di lavoro viene aggiornata per includere i nuovi cambiamenti.</p></translation> + <translation type="obsolete"><b>Recupero modifiche</b><p>Recupra le modifiche da un repository remoto in quello locale. Se le modifiche recuperate aggiungono un nuovo ramo, il ramo è automaticamente inserito, e l'inserimento viene consolidato. Altrimenti la cartella di lavoro viene aggiornata per includere i nuovi cambiamenti.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>Fetch</source> - <translation>Recupero</translation> + <translation type="obsolete">Recupero</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation>Il progetto deve essere riletto. Farlo ora ?</translation> + <translation type="obsolete">Il progetto deve essere riletto. Farlo ora ?</translation> </message> </context> <context> @@ -31880,307 +31880,307 @@ <translation type="obsolete">Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <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="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <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="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <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="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <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="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <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="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <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="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <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="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <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="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <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="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <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="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> @@ -32190,132 +32190,132 @@ <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -33952,39 +33952,19 @@ <context> <name>HgFetchDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation>Messaggio di commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Messaggio di commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation>Messagi di commit recenti</translation> + <translation type="obsolete">Messagi di commit recenti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation>Seleziona un messaggio di commit recete da usare</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Seleziona un messaggio di commit recete da usare</translation> </message> </context> <context> @@ -34861,7 +34841,7 @@ <translation type="obsolete">Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -34932,12 +34912,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -34962,7 +34942,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished"></translation> </message> @@ -34982,7 +34962,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -35027,12 +35007,12 @@ <translation type="unfinished"><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> @@ -35057,7 +35037,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -35067,42 +35047,37 @@ <translation type="unfinished">Pull changes da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>Fetch changes from a remote repository</source> - <translation type="unfinished">Recupero modifiche da un repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <translation type="obsolete">Recupero modifiche da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -35127,27 +35102,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -35192,118 +35167,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> @@ -35313,7 +35283,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35815,1452 +35785,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Nuovo dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Nuovo dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crea (clone) un nuovo progetto da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuovo dal repository</b><p>Crea (clone) un nuovo progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Mostra log in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Mostra il log delle modifiche in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostra log in ingresso</b><p>Mostra il log delle modifiche che entrano nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Pull modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Pull changes da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Pull modifiche</b><p>Scarica le modifiche da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Aggiorna da repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>&Aggiorna da repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Aggiorna il progetto locate da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Aggiorna dal repository</b><p>Aggiorna il progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Committa le modifica nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>&Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Committa le modifiche al progetto locale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Committa modifiche al repository</b><p>Committa le modifiche al progetto locale nel repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Mostra log in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Mostra il log della modifiche in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostra log in uscita</b><p>Mostra il log della modifiche che escono dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Push modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Push modifiche ad un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Push delle modifiche</b><p>Push delle modifiche dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Esporta dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Esporta dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Esporta il progetto dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Mostra &differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Mostra head</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Mostra head del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Mostra predecessori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Mostra il predecessori del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Mostra tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Mostra il tip del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>In&verti modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Fondi le modifiche dela revisione nel progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Tag del progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Elenca tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Elenca i branches del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Crea Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Crea &Branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Switch della directory di lavoro ad un'altra revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Esegui un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation>Mostra alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Verifica repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Verifica repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Verifica l'integrità del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Crea una file .hgignore con i valori di default</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation>Crea changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Mostra il brach corrente del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation>Segna un chageset selezionabile come good</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation>Segna un chageset selezionabile come bad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation>Push delle modifiche (forza)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation>Push delle modifiche verso un repository remoto con l'opzione force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <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="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished">Lista i segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished">Lista i segnalibri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished">Lista i segnalibri del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished">Definisci un segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished">Definisci un segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished">Definisci un segnalibro per il progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished">Cancella segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished">Cancella un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished">Rinomina segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished">Rinomina segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished">Rinomina un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished">Sposta segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished">Sposta segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished">Sposta un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished">Mostra i segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished">Estrae segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished">Mostra segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished">Inserisci segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -39684,22 +39654,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -39754,287 +39724,282 @@ <translation type="unfinished">Estensioni</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> + <source>Fetch</source> + <translation type="obsolete">Recupero</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished">Recupero</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished">GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished">MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished">Rete</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished">Host:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation type="unfinished">Host:</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished">Host</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished">Sicurezza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -40059,12 +40024,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -92379,24 +92344,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -92405,24 +92370,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -92432,12 +92397,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -92454,13 +92419,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_pt.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_pt.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2447,12 +2447,12 @@ <translation>Globais</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Atributos</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>Atributos da Classe</translation> </message> @@ -18803,7 +18803,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> <source>Fetching from a remote Mercurial repository</source> - <translation>Recuperando desde um repositório Mercurial remoto</translation> + <translation type="obsolete">Recuperando desde um repositório Mercurial remoto</translation> </message> </context> <context> @@ -18811,27 +18811,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> <source>Fetch changes</source> - <translation>Trazer alterações</translation> + <translation type="obsolete">Trazer alterações</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> <source>Fetch changes from a remote repository</source> - <translation>Trazer alterações de um repositório remoto</translation> + <translation type="obsolete">Trazer alterações de um repositório remoto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation><b>Trazer alterações</b><p>Pucha alterações dum repositório remoto ao repositório local. Se as alterações puxadas adicionam um novo cabeçalho de ramo, o cabeçalho será automaticamente mesclado e o resultado da mescla será cometido. Caso contrário, o diretório de trabalho será atualizado para incluir as novas alterações.</p></translation> + <translation type="obsolete"><b>Trazer alterações</b><p>Pucha alterações dum repositório remoto ao repositório local. Se as alterações puxadas adicionam um novo cabeçalho de ramo, o cabeçalho será automaticamente mesclado e o resultado da mescla será cometido. Caso contrário, o diretório de trabalho será atualizado para incluir as novas alterações.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>Fetch</source> - <translation>Trazer</translation> + <translation type="obsolete">Trazer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation>O projecto deveria ser relido. Fazer-lo agora?</translation> + <translation type="obsolete">O projecto deveria ser relido. Fazer-lo agora?</translation> </message> </context> <context> @@ -31415,307 +31415,307 @@ <translation type="obsolete">O processo hg não acabou em 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Criar repositorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>O repositorio do projeto não se pôde criar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>A criar repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>A clonar projeto dum repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation>A sincronizar com o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation>A adicionar ficheiros/diretorios ao repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation>A retirar ficheiros/diretorios do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation>A puxar dum repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation>Aplicar Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> @@ -31725,132 +31725,132 @@ <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation>A marcar como 'sem resolver'</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation>A marcar como 'sem resolver'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -33497,39 +33497,9 @@ <context> <name>HgFetchDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation>Mensagem de Cometido</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> - <source>Recent commit messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> - <source>Select a recent commit message to use</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Mensagem de Cometido</translation> </message> </context> <context> @@ -34416,7 +34386,7 @@ <translation type="obsolete">Não se pôde iniciar o executável hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> @@ -34478,12 +34448,12 @@ <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -34508,7 +34478,7 @@ <translation>Etiqueta a revisão selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished">Mudar</translation> </message> @@ -34528,7 +34498,7 @@ <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> @@ -34578,12 +34548,12 @@ <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> @@ -34603,7 +34573,7 @@ <translation type="unfinished">Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34613,42 +34583,37 @@ <translation type="unfinished">Puxar alterações do repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>Fetch changes from a remote repository</source> - <translation type="unfinished">Trazer alterações de um repositório remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <translation type="obsolete">Trazer alterações de um repositório remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -34673,27 +34638,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34738,118 +34703,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished">Verificar Assinaturas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished">Não há diferenças.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> </message> @@ -34859,7 +34819,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35359,1452 +35319,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Novo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Novo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Novo desde repositorio</b><p>Cria (clona) um projeto local novo desde um repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Mostrar registo entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Mostrar o registo de alterações entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar registo entrante</b><p>Mostra o registo das alterações entrantes ao repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Puxar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Puxar alterações do repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Puxar alterações</b><p>Puxa alterações do repositorio remoto para o repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Atualizar desde o repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>At&ualizar desde o repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Atualizar o projeto local desde o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Atualizar desde o repositorio</b><p>Atualiza o projeto local desde o repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Mostrar registo de saída</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Mostrar o registo de alterações saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Empurrar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Empurra alterações ao repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Empurrar alterações</b><p>Empurra as alterações do repositorio local a um repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation>Empurrar alterações (forçar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation>Empurra alterações ao repositorio remoto com a opção force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Empurrar alterações (forçar)</b><p>Empurra as alterações do repositorio local a um repositorio remoto usando a opção 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Exportar do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Exportar do repositório...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Exportar o projeto do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Mostrar navegador de registos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Mostrar &diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation type="unfinished">Mostrar estado do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Mostrar cabeçalhos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Mostrar os cabeçalhos do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Mostrar pais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Mostrar os pais do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Mostrar dica</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Mostrar a dica do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>&Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>&Mesclar alterações...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Listar ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Listar ramos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Listar os ramos do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Criar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Criar &ramo...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Criar um ramo novo para o projeto local no repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Criar ramo</b><p>Cria um ramo novo para o projeto local no repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Fechar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Fechar o ramo atual no projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Mostrar ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Mostrar o ramo atual do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Mudar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>M&udar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Mudar o diretorio de trabalho a outra revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Limpar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>Lim&par</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Limpar o projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Executar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>E&xecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Executa um comando de Mercurial arbitrário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostra a caixa de diálogo de configuração com a página de Mercurial selecionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Mostrar rotas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Mostrar rotas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Verificar a integridade do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Criar .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation type="unfinished">Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Marcar como "bom"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Marcar como "bom"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Marcar como "mau"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Marcar como "mau"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Restablecer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation>Empurrar ramo novo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation>Editar configuração de usuário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation>Editar configuração de usuário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation>Saltar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished">Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished">Conflitos resolvidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation>Adicionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation>Retirar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation>Retirar sub repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation>Mostrar Sumário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation>Mostrar sumário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation>Mostrar informação sumária do estado do diretorio de trabalho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation>Mostrar diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation>Mostrar conflitos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation>Mostrar conflitos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation>Conflitos sem resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation>Listar marcadores do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation>Definir um marcador para o projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation>Apagar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation>Apagar Marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation>Apagar um marcador do projeto </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation>Renomear marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation>Renomear marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation>Renomear um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation>Mover um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation>Mostrar uma lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation>Puxar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation>Puxa um marcador desde um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation>Mostrar a lista de marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation>Empurrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation>Empurrar um marcador a um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation>Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation>Ramos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -39229,22 +39189,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -39301,285 +39261,285 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the fetch extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de trazer (fetch)</translation> + <translation type="obsolete">Selecionar para ativar a extensão de trazer (fetch)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>Fetch</source> - <translation type="unfinished">Trazer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <translation type="obsolete">Trazer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the GPG extension</source> <translation type="unfinished">Selecionar para ativar a extensão GPG</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>GPG</source> <translation type="unfinished">GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished">Selecionar para ativar a extensão de ficheiros grandes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished">Ficheiros Grandes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de ficheiros grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> - <translation type="unfinished">Ficheiros Grandes</translation> + <source>Select to activate the Purge extension</source> + <translation type="unfinished">Selecionar para ativar a extensão purgar (Purge)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> + <translation type="unfinished">Purgar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> - <translation type="unfinished">Selecionar para ativar a extensão purgar (Purge)</translation> + <source>Select to activate the queues extension</source> + <translation type="unfinished">Selecionar para ativar a extensão de filas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> - <translation type="unfinished">Purgar</translation> + <source>Queues</source> + <translation type="unfinished">Filas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de filas</translation> + <source>Select to activate the rebase extension</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> - <translation type="unfinished">Filas</translation> + <source>Rebase</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> - <translation type="unfinished"></translation> + <source>Select to activate the shelve extension</source> + <translation type="unfinished">Selecionar para ativar a extensão de pilhas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de pilhas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished">Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished">Tamanho mínimo do ficheiro:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished">Introduzir o tamanho mínimo em MB dos ficheiros que devem ser tratados como Ficheiros Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished">Padrões:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished">Introduzir os padrões dos ficheiros (separados com espaços) a tratar como Ficheiros Grandes</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> - <translation type="unfinished">Padrões:</translation> + <source>Enter file patterns for large files</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished">Introduzir os padrões dos ficheiros (separados com espaços) a tratar como Ficheiros Grandes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished">Rede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished">Anfitrião:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation type="unfinished">Anfitrião:</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished">Senha:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished">Anfitrião</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished">Segurança</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -39604,12 +39564,12 @@ <translation type="unfinished">Padrão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -91449,24 +91409,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -91475,24 +91435,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -91503,12 +91463,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -91525,13 +91485,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_ru.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_ru.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2386,12 +2386,12 @@ <translation>Глобальные переменные</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Атрибуты</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>Атрибуты класса</translation> </message> @@ -17949,7 +17949,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> <source>Fetching from a remote Mercurial repository</source> - <translation>Mercurial: Получение изменений из удалённого репозитория</translation> + <translation type="obsolete">Mercurial: Получение изменений из удалённого репозитория</translation> </message> </context> <context> @@ -17957,27 +17957,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> <source>Fetch changes</source> - <translation>Получить изменения</translation> + <translation type="obsolete">Получить изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> <source>Fetch changes from a remote repository</source> - <translation>Получение изменений из удалённого репозитория</translation> + <translation type="obsolete">Получение изменений из удалённого репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation><b>Получить изменения</b><p>Затянуть изменения из удаленного репозитория в локальный репозиторий. Если изменения добавляют новую головную ветвь, голова автоматически объединяется, и результат фиксируется. В противном случае рабочая директория обновляется содержащимися новыми изменениями</p></translation> + <translation type="obsolete"><b>Получить изменения</b><p>Затянуть изменения из удаленного репозитория в локальный репозиторий. Если изменения добавляют новую головную ветвь, голова автоматически объединяется, и результат фиксируется. В противном случае рабочая директория обновляется содержащимися новыми изменениями</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>Fetch</source> - <translation>Fetch (получить изменения)</translation> + <translation type="obsolete">Fetch (получить изменения)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + <translation type="obsolete">Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> </context> <context> @@ -27980,437 +27980,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Невозможно создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Создание Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation>Mercurial: Первичная фиксация в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation>Mercurial: Клонирование проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation>Mercurial: Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Mercurial: Добавление файлов/директорий в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Mercurial: Удаление файлов/директорий из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветви в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжать ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите вернуть все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation>Вы действительно хотите вернуть все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation>Конечная ревизия текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Вы действительно хотите повторить слияние этих файлов или директорий?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation>Помеченные как 'unresolved'</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation>Помеченные как 'unresolved'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation>Помеченные как 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в 'области резервного копирования'<b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation>Копировать набор изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation>Копировать набор изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation>Отмена незавершенного слияния</translation> </message> @@ -29841,37 +29841,37 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> <source>Fetch Changes</source> - <translation>Получить изменения</translation> + <translation type="obsolete">Получить изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation>Описание изменений</translation> + <translation type="obsolete">Описание изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> <source>Enter commit message or leave empty to use the default message</source> - <translation>Введите описание изменений, или оставьте пустым для использования описания по умолчанию</translation> + <translation type="obsolete">Введите описание изменений, или оставьте пустым для использования описания по умолчанию</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation>Недавние сообщения фиксации</translation> + <translation type="obsolete">Недавние сообщения фиксации</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation>Выберите недавнее сообщение фиксации</translation> + <translation type="obsolete">Выберите недавнее сообщение фиксации</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> <source>Select to switch the merge order</source> - <translation>Разрешить изменение порядка слияния</translation> + <translation type="obsolete">Разрешить изменение порядка слияния</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> <source>Switch Parents when Merging</source> - <translation>Изменить порядок слияния</translation> + <translation type="obsolete">Изменить порядок слияния</translation> </message> </context> <context> @@ -30659,7 +30659,7 @@ <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> @@ -30711,12 +30711,12 @@ <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -30741,7 +30741,7 @@ <translation>Тег выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation>Переключиться</translation> </message> @@ -30761,7 +30761,7 @@ <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> @@ -30806,12 +30806,12 @@ <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> @@ -30836,7 +30836,7 @@ <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation>Затянуть изменения</translation> </message> @@ -30846,42 +30846,42 @@ <translation>Затянуть изменения из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation>Протолкнуть выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation>Протолкнуть выбранные наборы изменений и их предков в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation>Протолкнуть все изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation>Протолкнуть все изменения в удаленный репозиторий</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> <source>Fetch Changes</source> - <translation>Получить изменения (fetch)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <translation type="obsolete">Получить изменения (fetch)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> <source>Fetch changes from a remote repository</source> - <translation>Получить изменения из удалённого репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <translation type="obsolete">Получить изменения из удалённого репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation>Срезать наборы изменений из репозитория</translation> </message> @@ -30906,27 +30906,27 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> @@ -30971,119 +30971,119 @@ <translation>Слияние рабочей директории с выбранными наборами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Создать группу изменений</b> <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного изменения, будут скомплектованы все наборы изменений. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут скомплектованы. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут собраны в комплект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation>Применить просматриваемый в настоящее время файл группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation>Подписать ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation>Добавить подпись для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation>Выбрать все записи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> <source>Fetch Selected Changes</source> - <translation>Получить помеченные изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <translation type="obsolete">Получить помеченные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл патча <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> </message> @@ -31093,7 +31093,7 @@ <translation><a href="save:me">Сохранить</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> @@ -31595,1452 +31595,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>&Новый из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Создание (клонирование) нового проекта из Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Новый из репозитория</b><p>Создание (клонирование) нового локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Показать журнал входящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Показать журнал входящих</b><p>Отображение журнала входящих в репозиторий изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Затянуть изменения (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Затянуть изменения из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Затянуть изменения</b><p>Затягивание изменений из удаленного репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>&Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial: Обновить локальный проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Обновить из репозитория</b><p>Обновление локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Фиксация изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>&Фиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Mercurial: Фиксация изменений локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Фиксация изменений в репозитории</b><p>Фиксация изменений локального проекта в Mercurial репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation>Показать журнал исходящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation>Показать журнал исходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Показать журнал исходящих</b><p>Отображение журнала исходящих из репозитория изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>Протолкнуть изменения (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Протолкнуть изменения в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть изменения</b><p>Передать изменения из локального проекта в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation>Протолкнуть изменения принудительно (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation>Протолкнуть изменения в удалённый репозиторий (c опцией force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Протолкнуть изменения принудительно (force)</b><p>Передача изменений в удалённый репозиторий с опцией 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Показать журнал истории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать журнал истории</b><p>Отображение диалога просмотра журнала истории локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation>Показать конечную ревизию (tip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation>Показать конечную ревизию репозитория (tip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать конечную ревизию</b><p>Отображение конечной ревизии (tip) репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Вернуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>Ве&рнуть изменения (revert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation>Вернуть все изменения в локальном проекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Вернуть изменения</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation>Слияние изменений из ревизии с локальным проектом</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слияние</b><p>Слияние изменений из ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Тег в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>&Тег в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>Тег локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Список тегов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Список тегов...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>Список тегов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation>Отображение текущей ветви проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>Пе&реключиться (switch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочую директорию на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Очистить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>О&чистить (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистить</b><p>Выполнение очистки локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настройки</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation>Идентификация</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation>Идентификация...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Идентификация</b><p>Идентификация директории проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation>Просмотр группы изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Просмотр файла, содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation>Применить один или несколько файлов групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation>Пометить как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation>Пометить как "хорошие"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation>Пометить как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохие"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation>Сбросить данные Bisect-поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сброс данных bisect-поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation>Отменить предыдущие изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отменить изменения</b><p>Отмена предыдущих изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation>Автономный сервер репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation>Автономный сервер репозитория проекта...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation>Запуск автономного сервера репозитория проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation>Специальные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation>Управление группами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation>Поиск ревизии методом деления пополам (bisect)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Затянуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation>Протолкнуть новую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Протолкнуть текущую ветвь локального проекта как новую именованную ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Протолкнуть новую ветвь</b><p>Передать текущую ветвь локального проекта как новую именованную ветвь.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation>Плагины</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation>Правка конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation>Правка конфигурации репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation>Отображение редактора для правки конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation>Показать обобщенные параметры настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation>Показать обобщенные параметры настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation>Пропустить выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить выбранные изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation>Импорт патча...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation>Импортировать патч из файла патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Импорт патча</b><p>Импортирование патча из файла патча в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation>Вернуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation>Экспорт патчей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation>Экспорт ревизий в файлы патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Экспорт патчей</b><p>Экспорт ревизий проекта в файл патча.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation>Изменить фазу...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation>Изменить фазу ревизий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation>Копирование в текущую ветвь наборов изменений из другой ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Копировать наборы изменений</b><p>Копирование в текущую рабочую директорию наборов изменений из другой ветви , сохраняются имя пользователя, дата и описание оригинальных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation>Продолжить сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Продолжить последнюю сессию копирования после решения конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Продолжить сессию копирования</b><p>Продолжение последней сессии копирования после решения конфликтов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation>Копировать изменения (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation>Решенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation>Решенные кон&фликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Пометить все конфликты локального проекта как решенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Решенные конфликты</b><p>Пометить все конфликты локального проекта как решенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation>Удалить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation>Показать &статус...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation>Показать сводку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation>Показать сводку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation>Отображение суммарной информации о статусе рабочей директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation>Создать неверсированный архив...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Откатить последнюю транзакцию</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation>Администрирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation>Показать различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation>Список закладок...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation>Список закладок проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation>Определить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation>Удалить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation>Удалить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation>Переименовать закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation>Переименовать закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation>Переместить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другую набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation>Показать входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation>Показать список входящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation>Затянуть закладку из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть закладку</b><p>Загрузка закладки из удалённого репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation>Показать исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation>Показать список исходящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation>Протолкнуть закладку в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть закладку</b><p>Передача закладки из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation>Ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Повторить слияние всех конфликтующих, нерешенных файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation>Показать конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation>Показать конфликты...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation>Отображение диалога перечисления всех файлов, содержащих конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation>Нерешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Пометить все конфликты локального проекта как нерешенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Нерешенные конфликты</b><p>Пометить все конфликты локального проекта как нерешенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Повторное слияние</b><p>Повторное слияние всех конфликтующих, нерешенных файлов проекта, без учета всех предыдущих попыток слияния.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation>Затянуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation>Затянуть текущую закладку из удаленного репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть текущую закладку</b><p>Затягивание текущей закладки из удаленного репозитория в локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation>Протолкнуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation>Протолкнуть текущую закладку в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть текущую закладку</b><p>Проталкивание текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Удалить все резервные комплекты, сохраненные в области резервного копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Удалить все резервные копии</b><p>Удаление всех резервных комплектов, сохраненных в области резервного копирования репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation>Остановить сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation>Остановить прерванную сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation>Отменить сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation>Отменить прерванную сессию копирования и откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Отменить сессию копирования</b><p>Отменить прерванную сессию копирования и откатить к состоянию перед копированием.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation>Слить наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation>Копировать наборы изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation>Копировать наборы изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Остановить сессию копирования</b><p>Остановить прерванную сессию копирования.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation>Фиксировать слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Фиксировать слияние</b><p>Фиксация слияний рабочей директории</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation>Отменить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation>Отмена незавершенного слияния и потеря всех изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Отмена незавершенного слияния</b><p>Отмена незавершенного слияния, приводящая к потере всех изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation>Фиксировать все объединенные изменения.</translation> </message> @@ -35262,22 +35262,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation>Удалить отпечаток хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли отпечаток хоста <b>{0}</b> должен быть удален?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Вы можете потерять все изменения, сделанные в данном диалоге. Может сначала сохранить все данные?</translation> </message> @@ -35334,285 +35334,285 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the fetch extension</source> - <translation>Активировать плагин fetch</translation> + <translation type="obsolete">Активировать плагин fetch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>Fetch</source> - <translation>Fetch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <translation type="obsolete">Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the GPG extension</source> <translation>Активировать плагин GPG</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> <source>GPG</source> <translation>GPG</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation>Активировать плагин LargeFiles</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation>Large Files</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation>Активировать плагин LargeFiles</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> - <translation>Large Files</translation> + <source>Select to activate the Purge extension</source> + <translation>Активировать плагин Purge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> + <translation>Purge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> - <translation>Активировать плагин Purge</translation> + <source>Select to activate the queues extension</source> + <translation>Активировать плагин Queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> - <translation>Purge</translation> + <source>Queues</source> + <translation>Queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> - <translation>Активировать плагин Queues</translation> + <source>Select to activate the rebase extension</source> + <translation>Активировать плагин Rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> - <translation>Queues</translation> + <source>Rebase</source> + <translation>Rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> - <translation>Активировать плагин Rebase</translation> + <source>Select to activate the shelve extension</source> + <translation>Активировать плагин Shelve</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation>Rebase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation>Активировать плагин Shelve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation>Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation>Минимальный размер файла:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation>Минимальный размер в MB для файлов, рассматриваемых как большие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation> MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation>Шаблоны:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation>Задайте разделенные пробелами шаблоны файлов, рассматриваемых как большие</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> - <translation>Шаблоны:</translation> + <source>Enter file patterns for large files</source> + <translation>Задайте шаблоны для больших файлов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation>Задайте разделенные пробелами шаблоны файлов, рассматриваемых как большие</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation>Задайте шаблоны для больших файлов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation>Кэш пользователя:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation>Задайте имя директории кэша пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation>Хост:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation>Введите имя хоста сетевого прокси</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation>Хост:</translation> + <source>Enter Proxy Hostname</source> + <translation>Enter Proxy Hostname</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation>Введите имя хоста сетевого прокси</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> - <translation>Enter Proxy Hostname</translation> + <source>User:</source> + <translation>Пользователь:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> + <translation>Введите имя пользователя для сетевого прокси</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> - <translation>Пользователь:</translation> + <source>Enter Proxy Username</source> + <translation>Enter Proxy Username</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation>Введите имя пользователя для сетевого прокси</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation>Enter Proxy Username</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation>Пароль:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation>Введите пароль для сетевого прокси</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation>Введите пароль для Proxy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation>Обход:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation>Введите через запятую имена хостов в обход сетевого прокси</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation>Введите, через запятую, хосты в обход прокси</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation>Отпечатки хостов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation>Хост</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation>Отпечаток</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation>Отпечаток</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation>Добавить запись отпечатка хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation>Удалить запись отпечатка хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation>Изменить запись отпечатка хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation>Открыть файл конфигурации пользователя в текстовом редакторе</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation>Открыть в редакторе файл конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation>Активировать плагин Strip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation>Strip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation>Активировать плагин histedit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation>Histedit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation>Безопасность</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation>Отключить предупреждения TLS 1.0</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation>Минимальная версия протокола:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation>Выберите минимальную версию протокола для использования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation>Минимальная версия протокола хоста</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation>Минимальная версия</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation>Минимальная версия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation>Добавить запись о минимальной версии протокола хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation>Удалить запись о минимальной версии протокола хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation>Правка записи о минимальной версии протокола хоста</translation> </message> @@ -35637,12 +35637,12 @@ <translation>По умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation>Удалить минимальную версию протокола</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли запись о минимальной версии протокола хоста <b>{0}</b> должна быть удалена?</p></translation> </message> @@ -87255,24 +87255,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -87282,24 +87282,24 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -87310,12 +87310,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -87332,14 +87332,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Головная ревизия #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_tr.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_tr.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2424,12 +2424,12 @@ <translation>Evrensel</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>Nitelikler</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation type="unfinished"></translation> </message> @@ -18473,38 +18473,13 @@ </context> <context> <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>FetchProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + <translation type="obsolete">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> </context> <context> @@ -30572,307 +30547,307 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <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="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <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="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <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="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> @@ -30882,132 +30857,132 @@ <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -32646,39 +32621,19 @@ <context> <name>HgFetchDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation type="unfinished">Teslimat mesajı</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Teslimat mesajı</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation type="unfinished">Geçmiş teslimet mesajları</translation> + <translation type="obsolete">Geçmiş teslimet mesajları</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation type="unfinished">Geçmiş kayıt mesajlarından seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Geçmiş kayıt mesajlarından seç</translation> </message> </context> <context> @@ -33540,7 +33495,7 @@ <translation>Değiştirildi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -33616,12 +33571,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -33646,7 +33601,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> </message> @@ -33666,7 +33621,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33711,12 +33666,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> @@ -33741,7 +33696,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -33751,42 +33706,32 @@ <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -33811,27 +33756,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -33876,118 +33821,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> </message> @@ -33997,7 +33937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -34495,1452 +34435,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>Kaynak havuzundan yeni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>Kay&nak havuzundan yeni...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Mercurial proje havuzundan yeni bir proje oluştur(klonla)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation>Giren günlük kaydını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation>Değişiklikleri çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation>Değişiklileri uzak kaynak havuzundan çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Değişiklikleri çek</b><p>Bu uzaktaki bir kaynak havuzundan yerel koynak havuzuna değişiklileri çeker.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>Kaynak Havuzundan güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>Kaynak Hav&uzundan güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial kaynak havuzundan yerel projeyi güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Kaynak havuzundan güncelle</b><p>Bu güncelleme yerel projeyi Mercural kaunak havuzundan günceller.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak ha&vuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation>değişiklikleri kabul et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation>Uzak kaynak havuzuna değişiklikleri gönder</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation>Farkları gös&ter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>Etiketleri listele</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>Etiketleri listele...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>Branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>Branşlar listesi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>Prosenin branşlar listesi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished">Ekle...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -38363,22 +38303,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -38434,286 +38374,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished">MB</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished">Ağ</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished">Sunucu:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation type="unfinished">Sunucu:</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished">Parola:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished">Güvenlik</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -38738,12 +38668,12 @@ <translation type="unfinished">Varsayılan</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -90602,24 +90532,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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> @@ -90628,23 +90558,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -90655,12 +90585,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90671,13 +90601,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_zh_CN.ts Fri Aug 28 19:34:39 2020 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Fri Aug 28 19:50:22 2020 +0200 @@ -2435,7 +2435,7 @@ <translation>全局</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="771"/> + <location filename="../UI/BrowserModel.py" line="774"/> <source>Attributes</source> <translation>属性</translation> </message> @@ -2445,7 +2445,7 @@ <translation>编码： {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="781"/> + <location filename="../UI/BrowserModel.py" line="784"/> <source>Class Attributes</source> <translation>类属性</translation> </message> @@ -18586,39 +18586,9 @@ </context> <context> <name>Fetch</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="70"/> - <source>Fetching from a remote Mercurial repository</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>FetchProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="35"/> - <source>Fetch changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="40"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="43"/> - <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="92"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>FileDialogWizard</name> @@ -31229,307 +31199,307 @@ <translation type="obsolete">hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>创建项目仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>无法创建项目仓库。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> <source>Creating Mercurial repository</source> <translation>创建 Mercurial 仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="328"/> <source>Initial commit to Mercurial repository</source> <translation>向 Mercurial 仓库进行初始提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="368"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="724"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="781"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1022"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1299"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2504"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2523"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2552"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2444"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <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="2586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2380"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2483"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2397"/> <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="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> <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="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="541"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3247"/> <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="3397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> @@ -31539,132 +31509,132 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1069"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1074"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1987"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2018"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -33253,39 +33223,19 @@ <context> <name>HgFetchDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="23"/> <source>Commit Message</source> - <translation type="unfinished">提交消息</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="29"/> - <source>Enter commit message or leave empty to use the default message</source> - <translation type="unfinished"></translation> + <translation type="obsolete">提交消息</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="39"/> <source>Recent commit messages</source> - <translation type="unfinished">最近提交消息</translation> + <translation type="obsolete">最近提交消息</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="46"/> <source>Select a recent commit message to use</source> - <translation type="unfinished">选择使用一个最近提交消息</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="56"/> - <source>Select to switch the merge order</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="59"/> - <source>Switch Parents when Merging</source> - <translation type="unfinished"></translation> + <translation type="obsolete">选择使用一个最近提交消息</translation> </message> </context> <context> @@ -34142,7 +34092,7 @@ <translation type="obsolete">无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="841"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -34213,12 +34163,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1991"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34243,7 +34193,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> @@ -34263,7 +34213,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34308,12 +34258,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2441"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -34338,7 +34288,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2161"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34348,42 +34298,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="331"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="334"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2175"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2207"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> - <source>Fetch changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="381"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> @@ -34408,27 +34348,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2086"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2110"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34473,118 +34413,113 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="339"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="344"/> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2299"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="356"/> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="361"/> <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> <source>Add a signature for the selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="366"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> <source>Verify all signatures there may be for the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="384"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1381"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1517"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1527"/> - <source>Fetch Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2485"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2495"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2560"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2511"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2536"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2646"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2663"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2679"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> </message> @@ -34594,7 +34529,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2484"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35096,1452 +35031,1452 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>New from repository</source> <translation>从仓库新建</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> <source>&New from repository...</source> <translation>从仓库新建(&N)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="160"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>Update from repository</source> <translation>从仓库更新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source>&Update from repository</source> <translation>从仓库更新(&U)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>Commit changes to repository</source> <translation>将更改提交到仓库中</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> <source>&Commit changes to repository...</source> <translation>将更改提交到仓库中(&C)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="205"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="224"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Export from repository</source> <translation>从仓库导出</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>&Export from repository...</source> <translation>从仓库导出(&E)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Export a project from the repository</source> <translation>从仓库中导出一个项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source>Show a dialog to browse the log of the local project</source> <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show &difference</source> <translation type="unfinished">显示差异(&d)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订版本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> <source>Re&vert changes</source> <translation type="unfinished">还原改变(&v)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">还原所有改变到本地项目中</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1730"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> <source>Mer&ge changes...</source> <translation type="unfinished">合并更改(&g)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <source>&Tag in repository...</source> <translation>在仓库中标记(&T)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> <source>Tag the local project in the repository</source> <translation>在仓库中标记本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags</source> <translation>列出标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>List tags...</source> <translation>列出标签…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <source>List tags of the project</source> <translation>列出项目的标签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches</source> <translation>列出分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> <source>List branches...</source> <translation>列出分支…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>List branches of the project</source> <translation>列出项目的分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create branch</source> <translation>创建分支</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Create &branch...</source> <translation>创建分支(&B)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Cleanu&p</source> <translation type="unfinished">清除(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source>Cleanup the local project</source> <translation type="unfinished">清除本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Execute command</source> <translation type="unfinished">执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>E&xecute command...</source> <translation>执行命令(&X)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="719"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1862"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="821"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="883"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1372"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350"/> <source>Specials</source> <translation type="unfinished">特殊</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="934"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1673"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1417"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="678"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1918"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1366"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1940"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1938"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1960"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1000"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Conflicts resolved</source> <translation type="unfinished">冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="481"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Con&flicts resolved</source> <translation type="unfinished">冲突已解决(&F)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Add...</source> <translation type="unfinished">添加…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1437"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1085"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show differences</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show differences (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1182"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1226"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1396"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1525"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1210"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1264"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1278"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1276"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025"/> <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> <source>Abort Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1987"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2004"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2002"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Abort Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> <source>Commit all the merged changes.</source> <translation type="unfinished"></translation> </message> @@ -38907,22 +38842,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="545"/> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="715"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -38978,286 +38913,276 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <source>Select to activate the fetch extension</source> + <source>Select to activate the GPG extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> - <source>Select to activate the GPG extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>GPG</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="222"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> - <source>Select to activate the largefiles extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="232"/> - <source>Large Files</source> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the Purge extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Purge</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Queues</source> + <source>Rebase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the shelve extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="199"/> - <source>Rebase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> - <source>Select to activate the shelve extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Shelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="228"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="241"/> <source> MB</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="267"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="274"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="277"/> - <source>Patterns:</source> + <source>Enter file patterns for large files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="284"/> - <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="287"/> - <source>Enter file patterns for large files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="294"/> <source>User Cache:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="300"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> <source>Network</source> <translation type="unfinished">网络</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> <source>Proxy</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="348"/> + <source>Host:</source> + <translation type="unfinished">主机：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="358"/> - <source>Host:</source> - <translation type="unfinished">主机：</translation> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <source>Enter the network proxy host name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="368"/> - <source>Enter Proxy Hostname</source> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="372"/> + <source>Enter the user name for the network proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>User:</source> + <source>Enter Proxy Username</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> - <source>Enter the user name for the network proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="385"/> - <source>Enter Proxy Username</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="392"/> <source>Password:</source> <translation type="unfinished">密码：</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="415"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="478"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="488"/> - <source>Fingerprint</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="498"/> <source>Add a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="495"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> <source>Open the user configuration file in a text editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="642"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> <source>Security</source> <translation type="unfinished">安全</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> <source>Minimum Protocol per Host</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="586"/> + <source>Minimum Protocol</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="596"/> - <source>Minimum Protocol</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="606"/> <source>Add a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="603"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -39282,12 +39207,12 @@ <translation type="unfinished">默认</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> @@ -91581,46 +91506,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1353"/> <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="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> <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="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1373"/> <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="1907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> <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="1930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1928"/> <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="1934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> <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> @@ -91628,12 +91553,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -91644,13 +91569,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1900"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
