Tue, 14 May 2019 19:52:39 +0200
Mercurial Interface
- added support for the 'closehead' extension (as of Mercurial 4.8)
- added support for the '--keep' flag of the shelve command (as of Mercurial 5.0)
--- a/docs/changelog Sun May 12 15:31:23 2019 +0200 +++ b/docs/changelog Tue May 14 19:52:39 2019 +0200 @@ -15,6 +15,9 @@ first batch of local changesets -- show different icons for incoming, outgoing and normal changesets -- added capability to search and filter based on the changeset phase + -- added support for the 'closehead' extension (as of Mercurial 4.8) + -- added support for the '--keep' flag of the shelve command (as of + Mercurial 5.0) - Shell -- added capability to place the Shell window in the left or right side container
--- a/eric6.e4p Sun May 12 15:31:23 2019 +0200 +++ b/eric6.e4p Tue May 14 19:52:39 2019 +0200 @@ -626,6 +626,10 @@ <Source>eric6/Plugins/VcsPlugins/vcsGit/ProjectHelper.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsGit/__init__.py</Source> <Source>eric6/Plugins/VcsPlugins/vcsGit/git.py</Source> + <Source>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py</Source> + <Source>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py</Source> + <Source>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/__init__.py</Source> + <Source>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py</Source> <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> @@ -1734,6 +1738,7 @@ <Source>setup.py</Source> </Sources> <Forms> + <Form>eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui</Form> <Form>eric6/CondaInterface/CondaExecDialog.ui</Form> <Form>eric6/CondaInterface/CondaExportDialog.ui</Form> <Form>eric6/CondaInterface/CondaInfoDialog.ui</Form>
--- a/eric6/APIs/Python3/eric6.api Sun May 12 15:31:23 2019 +0200 +++ b/eric6/APIs/Python3/eric6.api Tue May 14 19:52:39 2019 +0200 @@ -5695,6 +5695,15 @@ eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsTag?4(name, revision=None, tagName=None) eric6.Plugins.VcsPlugins.vcsGit.git.Git.vcsUpdate?4(name, noDialog=False, revision=None) eric6.Plugins.VcsPlugins.vcsGit.git.Git?1(plugin, parent=None, name=None) +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.HgCloseHeadSelectionDialog.getData?4() +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged?4() +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.HgCloseHeadSelectionDialog?1(vcs, ppath, parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.CloseheadProjectHelper.initActions?4() +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.CloseheadProjectHelper.initMenu?4(mainMenu) +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.CloseheadProjectHelper.menuTitle?4() +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.CloseheadProjectHelper?1() +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.Closehead.hgCloseheads?4(name, revisions=None) +eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.Closehead?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.Config.ConfigHgSchemes?7 eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() @@ -6322,7 +6331,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.start?4(projectDir) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog?1(vcs, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.HgShelveDataDialog.getData?4() -eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.HgShelveDataDialog?1(parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.HgShelveDataDialog?1(version, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog.getSelectedShelves?4() eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged?4() eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog?1(message, shelveNames, parent=None)
--- a/eric6/APIs/Python3/eric6.bas Sun May 12 15:31:23 2019 +0200 +++ b/eric6/APIs/Python3/eric6.bas Tue May 14 19:52:39 2019 +0200 @@ -80,6 +80,8 @@ ClickToFlashPlugin WebPluginInterface ClickToFlashWhitelistDialog QDialog Ui_ClickToFlashWhitelistDialog ClosedTabsManager QObject +Closehead HgExtension +CloseheadProjectHelper HgExtensionProjectHelper CodeDocumentationViewer QWidget CodeMetricsDialog QDialog Ui_CodeMetricsDialog CodeStyleAddBuiltinIgnoreDialog QDialog Ui_CodeStyleAddBuiltinIgnoreDialog @@ -435,6 +437,7 @@ HgBundleDialog QDialog Ui_HgBundleDialog HgClient QObject HgClientPromptDialog QDialog Ui_HgClientPromptDialog +HgCloseHeadSelectionDialog QDialog Ui_HgCloseHeadSelectionDialog HgCommandDialog QDialog Ui_HgCommandDialog HgCommitDialog QWidget Ui_HgCommitDialog HgConflictsListDialog QWidget Ui_HgConflictsListDialog
--- a/eric6/Documentation/Help/source.qhp Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Documentation/Help/source.qhp Tue May 14 19:52:39 2019 +0200 @@ -622,6 +622,11 @@ <section title="eric6.Plugins.VcsPlugins.vcsGit.git" ref="eric6.Plugins.VcsPlugins.vcsGit.git.html" /> </section> <section title="eric6.Plugins.VcsPlugins.vcsMercurial" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.html"> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html"> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html" /> + <section title="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html" /> + </section> <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> @@ -3004,6 +3009,16 @@ <keyword name="ClosedTabsManager.isClosedTabAvailable" id="ClosedTabsManager.isClosedTabAvailable" ref="eric6.WebBrowser.ClosedTabsManager.html#ClosedTabsManager.isClosedTabAvailable" /> <keyword name="ClosedTabsManager.recordBrowser" id="ClosedTabsManager.recordBrowser" ref="eric6.Helpviewer.ClosedTabsManager.html#ClosedTabsManager.recordBrowser" /> <keyword name="ClosedTabsManager.recordBrowser" id="ClosedTabsManager.recordBrowser" ref="eric6.WebBrowser.ClosedTabsManager.html#ClosedTabsManager.recordBrowser" /> + <keyword name="Closehead" id="Closehead" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html#Closehead" /> + <keyword name="Closehead (Constructor)" id="Closehead (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html#Closehead.__init__" /> + <keyword name="Closehead.hgCloseheads" id="Closehead.hgCloseheads" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html#Closehead.hgCloseheads" /> + <keyword name="CloseheadExtension (Package)" id="CloseheadExtension (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html" /> + <keyword name="CloseheadProjectHelper" id="CloseheadProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper" /> + <keyword name="CloseheadProjectHelper (Constructor)" id="CloseheadProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper.__init__" /> + <keyword name="CloseheadProjectHelper.__hgClosehead" id="CloseheadProjectHelper.__hgClosehead" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper.__hgClosehead" /> + <keyword name="CloseheadProjectHelper.initActions" id="CloseheadProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper.initActions" /> + <keyword name="CloseheadProjectHelper.initMenu" id="CloseheadProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper.initMenu" /> + <keyword name="CloseheadProjectHelper.menuTitle" id="CloseheadProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html#CloseheadProjectHelper.menuTitle" /> <keyword name="CodeDocumentationViewer" id="CodeDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer" /> <keyword name="CodeDocumentationViewer (Constructor)" id="CodeDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__init__" /> <keyword name="CodeDocumentationViewer (Module)" id="CodeDocumentationViewer (Module)" ref="eric6.UI.CodeDocumentationViewer.html" /> @@ -8852,6 +8867,12 @@ <keyword name="HgClientPromptDialog.isPassword" id="HgClientPromptDialog.isPassword" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.isPassword" /> <keyword name="HgClientPromptDialog.on_inputEdit_textChanged" id="HgClientPromptDialog.on_inputEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.on_inputEdit_textChanged" /> <keyword name="HgClientPromptDialog.on_passwordCheckBox_toggled" id="HgClientPromptDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgClientPromptDialog.html#HgClientPromptDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgCloseHeadSelectionDialog" id="HgCloseHeadSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html#HgCloseHeadSelectionDialog" /> + <keyword name="HgCloseHeadSelectionDialog (Constructor)" id="HgCloseHeadSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html#HgCloseHeadSelectionDialog.__init__" /> + <keyword name="HgCloseHeadSelectionDialog (Module)" id="HgCloseHeadSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html" /> + <keyword name="HgCloseHeadSelectionDialog.__getHeads" id="HgCloseHeadSelectionDialog.__getHeads" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html#HgCloseHeadSelectionDialog.__getHeads" /> + <keyword name="HgCloseHeadSelectionDialog.getData" id="HgCloseHeadSelectionDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html#HgCloseHeadSelectionDialog.getData" /> + <keyword name="HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged" id="HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html#HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged" /> <keyword name="HgCommandDialog" id="HgCommandDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog" /> <keyword name="HgCommandDialog (Constructor)" id="HgCommandDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog.__init__" /> <keyword name="HgCommandDialog (Module)" id="HgCommandDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> @@ -9083,6 +9104,7 @@ <keyword name="HgLogBrowserDialog.__bookmarkMoveActTriggered" id="HgLogBrowserDialog.__bookmarkMoveActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkMoveActTriggered" /> <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" /> @@ -9095,6 +9117,7 @@ <keyword name="HgLogBrowserDialog.__generatorFinished" id="HgLogBrowserDialog.__generatorFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generatorFinished" /> <keyword name="HgLogBrowserDialog.__getClosedBranches" id="HgLogBrowserDialog.__getClosedBranches" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getClosedBranches" /> <keyword name="HgLogBrowserDialog.__getColor" id="HgLogBrowserDialog.__getColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getColor" /> + <keyword name="HgLogBrowserDialog.__getHeads" id="HgLogBrowserDialog.__getHeads" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getHeads" /> <keyword name="HgLogBrowserDialog.__getLogEntries" id="HgLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getLogEntries" /> <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" /> <keyword name="HgLogBrowserDialog.__getRevisionOfTag" id="HgLogBrowserDialog.__getRevisionOfTag" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getRevisionOfTag" /> @@ -9599,6 +9622,7 @@ <keyword name="HgTagBranchListDialog (Constructor)" id="HgTagBranchListDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__init__" /> <keyword name="HgTagBranchListDialog (Module)" id="HgTagBranchListDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" /> <keyword name="HgTagBranchListDialog.__closeBranch" id="HgTagBranchListDialog.__closeBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__closeBranch" /> + <keyword name="HgTagBranchListDialog.__closeBranchHeads" id="HgTagBranchListDialog.__closeBranchHeads" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__closeBranchHeads" /> <keyword name="HgTagBranchListDialog.__finish" id="HgTagBranchListDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__finish" /> <keyword name="HgTagBranchListDialog.__generateItem" id="HgTagBranchListDialog.__generateItem" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__generateItem" /> <keyword name="HgTagBranchListDialog.__highlightCurrentBranch" id="HgTagBranchListDialog.__highlightCurrentBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html#HgTagBranchListDialog.__highlightCurrentBranch" /> @@ -13186,6 +13210,7 @@ <keyword name="ProjectFormsBrowser.getUiCompiler" id="ProjectFormsBrowser.getUiCompiler" ref="eric6.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.getUiCompiler" /> <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" /> @@ -19056,6 +19081,7 @@ <keyword name="cleanupSource (Module)" id="cleanupSource (Module)" ref="cleanupSource.html" /> <keyword name="clearPrivateData" id="clearPrivateData" ref="eric6.Plugins.PluginVcsGit.html#clearPrivateData" /> <keyword name="clearPrivateData" id="clearPrivateData" ref="eric6.Plugins.PluginVcsMercurial.html#clearPrivateData" /> + <keyword name="closehead (Module)" id="closehead (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html" /> <keyword name="codeStyleBatchCheck" id="codeStyleBatchCheck" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#codeStyleBatchCheck" /> <keyword name="codeStyleCheck" id="codeStyleCheck" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#codeStyleCheck" /> <keyword name="compactPath" id="compactPath" ref="eric6.Utilities.__init__.html#compactPath" /> @@ -20405,6 +20431,9 @@ <file>eric6.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.ProjectHelper.html</file> <file>eric6.Plugins.VcsPlugins.vcsGit.git.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html</file> + <file>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html</file> + <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> @@ -21174,6 +21203,7 @@ <file>index-eric6.Plugins.VcsPlugins.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html</file> <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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,141 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog</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.CloseheadExtension.HgCloseHeadSelectionDialog</h1> +<p> +Module implementing a dialog to select the heads to be closed. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgCloseHeadSelectionDialog">HgCloseHeadSelectionDialog</a></td> +<td>Class implementing a dialog to select the heads to be closed.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgCloseHeadSelectionDialog" ID="HgCloseHeadSelectionDialog"></a> +<h2>HgCloseHeadSelectionDialog</h2> +<p> + Class implementing a dialog to select the heads to be closed. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgCloseHeadSelectionDialog +<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="#HgCloseHeadSelectionDialog.__init__">HgCloseHeadSelectionDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgCloseHeadSelectionDialog.__getHeads">__getHeads</a></td> +<td>Private method to get the open heads.</td> +</tr><tr> +<td><a href="#HgCloseHeadSelectionDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged">on_headsList_itemSelectionChanged</a></td> +<td>Private slot handling changes of the selection.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgCloseHeadSelectionDialog.__init__" ID="HgCloseHeadSelectionDialog.__init__"></a> +<h4>HgCloseHeadSelectionDialog (Constructor)</h4> +<b>HgCloseHeadSelectionDialog</b>(<i>vcs, ppath, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the VCS object +</dd><dt><i>ppath</i> (str)</dt> +<dd> +directory containing the repository +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HgCloseHeadSelectionDialog.__getHeads" ID="HgCloseHeadSelectionDialog.__getHeads"></a> +<h4>HgCloseHeadSelectionDialog.__getHeads</h4> +<b>__getHeads</b>(<i>vcs, ppath</i>) +<p> + Private method to get the open heads. +</p><dl> +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the VCS object +</dd><dt><i>ppath</i> (str)</dt> +<dd> +directory containing the repository +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the revision and the corresponding + branch name +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of tuples of (str, str) +</dd> +</dl><a NAME="HgCloseHeadSelectionDialog.getData" ID="HgCloseHeadSelectionDialog.getData"></a> +<h4>HgCloseHeadSelectionDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing a list of selected revisions and the commit + message +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (list of str, str) +</dd> +</dl><a NAME="HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged" ID="HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged"></a> +<h4>HgCloseHeadSelectionDialog.on_headsList_itemSelectionChanged</h4> +<b>on_headsList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot handling changes of the selection. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,128 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.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.CloseheadExtension.ProjectHelper</h1> +<p> +Module implementing the closehead extension project helper. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#CloseheadProjectHelper">CloseheadProjectHelper</a></td> +<td>Class implementing the closehead extension project helper.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="CloseheadProjectHelper" ID="CloseheadProjectHelper"></a> +<h2>CloseheadProjectHelper</h2> +<p> + Class implementing the closehead 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="#CloseheadProjectHelper.__init__">CloseheadProjectHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#CloseheadProjectHelper.__hgClosehead">__hgClosehead</a></td> +<td>Private slot used to close arbitrary heads.</td> +</tr><tr> +<td><a href="#CloseheadProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr><tr> +<td><a href="#CloseheadProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr><tr> +<td><a href="#CloseheadProjectHelper.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="CloseheadProjectHelper.__init__" ID="CloseheadProjectHelper.__init__"></a> +<h4>CloseheadProjectHelper (Constructor)</h4> +<b>CloseheadProjectHelper</b>(<i></i>) +<p> + Constructor +</p><a NAME="CloseheadProjectHelper.__hgClosehead" ID="CloseheadProjectHelper.__hgClosehead"></a> +<h4>CloseheadProjectHelper.__hgClosehead</h4> +<b>__hgClosehead</b>(<i></i>) +<p> + Private slot used to close arbitrary heads. +</p><a NAME="CloseheadProjectHelper.initActions" ID="CloseheadProjectHelper.initActions"></a> +<h4>CloseheadProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p><a NAME="CloseheadProjectHelper.initMenu" ID="CloseheadProjectHelper.initMenu"></a> +<h4>CloseheadProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p><dl> +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +populated menu (QMenu) +</dd> +</dl><a NAME="CloseheadProjectHelper.menuTitle" ID="CloseheadProjectHelper.menuTitle"></a> +<h4>CloseheadProjectHelper.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 +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,97 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead</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.CloseheadExtension.closehead</h1> +<p> +Module implementing the closehead extension interface. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Closehead">Closehead</a></td> +<td>Class implementing the strip extension interface.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="Closehead" ID="Closehead"></a> +<h2>Closehead</h2> +<p> + Class implementing the strip 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="#Closehead.__init__">Closehead</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Closehead.hgCloseheads">hgCloseheads</a></td> +<td>Public method to close arbitrary heads.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="Closehead.__init__" ID="Closehead.__init__"></a> +<h4>Closehead (Constructor)</h4> +<b>Closehead</b>(<i>vcs</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +</dl><a NAME="Closehead.hgCloseheads" ID="Closehead.hgCloseheads"></a> +<h4>Closehead.hgCloseheads</h4> +<b>hgCloseheads</b>(<i>name, revisions=None</i>) +<p> + Public method to close arbitrary heads. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +file/directory name +</dd><dt><i>revisions</i> (str)</dt> +<dd> +revisions of branch heads to be closed +</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.HgLogBrowserDialog.html Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Tue May 14 19:52:39 2019 +0200 @@ -81,6 +81,9 @@ <td><a href="#HgLogBrowserDialog.__bundleActTriggered">__bundleActTriggered</a></td> <td>Private slot to create a changegroup file.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__closeHeadsActTriggered">__closeHeadsActTriggered</a></td> +<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> @@ -117,6 +120,9 @@ <td><a href="#HgLogBrowserDialog.__getColor">__getColor</a></td> <td>Private method to get the (rotating) name of the color given an index.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__getHeads">__getHeads</a></td> +<td>Private method to get the list of all heads.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__getLogEntries">__getLogEntries</a></td> <td>Private method to retrieve log entries from the repository.</td> </tr><tr> @@ -402,6 +408,11 @@ <b>__bundleActTriggered</b>(<i></i>) <p> Private slot to create a changegroup file. +</p><a NAME="HgLogBrowserDialog.__closeHeadsActTriggered" ID="HgLogBrowserDialog.__closeHeadsActTriggered"></a> +<h4>HgLogBrowserDialog.__closeHeadsActTriggered</h4> +<b>__closeHeadsActTriggered</b>(<i></i>) +<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>) @@ -599,7 +610,12 @@ <dd> color name (string) </dd> -</dl><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> +</dl><a NAME="HgLogBrowserDialog.__getHeads" ID="HgLogBrowserDialog.__getHeads"></a> +<h4>HgLogBrowserDialog.__getHeads</h4> +<b>__getHeads</b>(<i></i>) +<p> + Private method to get the list of all heads. +</p><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> <h4>HgLogBrowserDialog.__getLogEntries</h4> <b>__getLogEntries</b>(<i>startRev=None, noEntries=0</i>) <p>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Tue May 14 19:52:39 2019 +0200 @@ -63,6 +63,9 @@ <td><a href="#HgTagBranchListDialog.__closeBranch">__closeBranch</a></td> <td>Private slot to close the selected branch.</td> </tr><tr> +<td><a href="#HgTagBranchListDialog.__closeBranchHeads">__closeBranchHeads</a></td> +<td>Private slot to close the selected branches.</td> +</tr><tr> <td><a href="#HgTagBranchListDialog.__finish">__finish</a></td> <td>Private slot called when the process finished or the user pressed the button.</td> </tr><tr> @@ -146,6 +149,11 @@ <b>__closeBranch</b>(<i></i>) <p> Private slot to close the selected branch. +</p><a NAME="HgTagBranchListDialog.__closeBranchHeads" ID="HgTagBranchListDialog.__closeBranchHeads"></a> +<h4>HgTagBranchListDialog.__closeBranchHeads</h4> +<b>__closeBranchHeads</b>(<i></i>) +<p> + Private slot to close the selected branches. </p><a NAME="HgTagBranchListDialog.__finish" ID="HgTagBranchListDialog.__finish"></a> <h4>HgTagBranchListDialog.__finish</h4> <b>__finish</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html Tue May 14 19:52:39 2019 +0200 @@ -70,13 +70,16 @@ </table> <a NAME="HgShelveDataDialog.__init__" ID="HgShelveDataDialog.__init__"></a> <h4>HgShelveDataDialog (Constructor)</h4> -<b>HgShelveDataDialog</b>(<i>parent=None</i>) +<b>HgShelveDataDialog</b>(<i>version, parent=None</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>version</i> (tuple of three int)</dt> <dd> -reference to the parent widget (QWidget) +Mercurial version +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget </dd> </dl><a NAME="HgShelveDataDialog.getData" ID="HgShelveDataDialog.getData"></a> <h4>HgShelveDataDialog.getData</h4> @@ -86,9 +89,14 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple containing the name (string), date (QDateTime), - message (string) and a flag indicating to add/remove - new/missing files (boolean) +tuple containing the name, date, message, a flag indicating + to add/remove new/missing files and a flag indicating to keep the + shelved changes in the working directory +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, QDateTime, str, bool, bool) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,41 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension</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.CloseheadExtension</h1> +<p> +Package implementing the closehead extension support interface. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.HgCloseHeadSelectionDialog.html">HgCloseHeadSelectionDialog</a></td> +<td>Module implementing a dialog to select the heads to be closed.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the closehead extension project helper.</td> +</tr><tr> +<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html">closehead</a></td> +<td>Module implementing the closehead extension interface.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Tue May 14 19:52:39 2019 +0200 @@ -30,6 +30,9 @@ <h3>Packages</h3> <table> <tr> +<td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html">CloseheadExtension</a></td> +<td>Package implementing the closehead extension support interface.</td> +</tr><tr> <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html">ConfigurationPage</a></td> <td>Package implementing the the Mercurial configuration page.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select the heads to be closed. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtCore import pyqtSlot, QProcess +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem + +from .Ui_HgCloseHeadSelectionDialog import Ui_HgCloseHeadSelectionDialog + + +class HgCloseHeadSelectionDialog(QDialog, Ui_HgCloseHeadSelectionDialog): + """ + Class implementing a dialog to select the heads to be closed. + """ + def __init__(self, vcs, ppath, parent=None): + """ + Constructor + + @param vcs reference to the VCS object + @type Hg + @param ppath directory containing the repository + @type str + @param parent reference to the parent widget + @type QWidget + """ + super(HgCloseHeadSelectionDialog, self).__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + heads = self.__getHeads(vcs, ppath) + for revision, branch in heads: + QTreeWidgetItem(self.headsList, [revision, branch]) + + def __getHeads(self, vcs, ppath): + """ + Private method to get the open heads. + + @param vcs reference to the VCS object + @type Hg + @param ppath directory containing the repository + @type str + @return list of tuples containing the revision and the corresponding + branch name + @rtype list of tuples of (str, str) + """ + args = vcs.initCommand("heads") + args.append('--template') + args.append('{node|short}@@@{branches}\n') + + output = "" + client = vcs.getClient() + if client is None: + # find the root of the repo + repodir = self.splitPath(ppath)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return [] + + process = QProcess() + process.setWorkingDirectory(repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.getEncoding(), 'replace') + else: + output, error = client.runcommand(args) + + heads = [] + if output: + for line in output.splitlines(): + line = line.strip() + if line: + revision, branch = line.split("@@@") + heads.append((revision, branch)) + + return heads + + @pyqtSlot() + def on_headsList_itemSelectionChanged(self): + """ + Private slot handling changes of the selection. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + len(self.headsList.selectedItems()) > 0 + ) + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple containing a list of selected revisions and the commit + message + @rtype tuple of (list of str, str) + """ + revisions = [itm.text(0) for itm in self.headsList.selectedItems()] + message = self.logEdit.toPlainText().strip() + + return revisions, message
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgCloseHeadSelectionDialog</class> + <widget class="QDialog" name="HgCloseHeadSelectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>532</width> + <height>402</height> + </rect> + </property> + <property name="windowTitle"> + <string>Close Heads</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select heads to be closed:</string> + </property> + </widget> + </item> + <item> + <widget class="QTreeWidget" name="headsList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Revision</string> + </property> + </column> + <column> + <property name="text"> + <string>Branch</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Commit Message:</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="logEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </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>headsList</tabstop> + <tabstop>logEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgCloseHeadSelectionDialog</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>HgCloseHeadSelectionDialog</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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the closehead extension project helper. +""" + +from __future__ import unicode_literals + +from PyQt5.QtWidgets import QMenu + +from E5Gui.E5Action import E5Action + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + +import UI.PixmapCache + + +class CloseheadProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the closehead extension project helper. + """ + def __init__(self): + """ + Constructor + """ + super(CloseheadProjectHelper, self).__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgCloseheadAct = E5Action( + self.tr('Close Heads'), + UI.PixmapCache.getIcon("closehead"), + self.tr('Close Heads'), + 0, 0, self, 'mercurial_closehead') + self.hgCloseheadAct.setStatusTip(self.tr( + 'Close arbitrary heads without checking them out first' + )) + self.hgCloseheadAct.setWhatsThis(self.tr( + """<b>Close Heads</b>""" + """<p>This closes arbitrary heads without the need to check them""" + """ out first.</p>""" + )) + self.hgCloseheadAct.triggered.connect(self.__hgClosehead) + self.actions.append(self.hgCloseheadAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu (QMenu) + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setIcon(UI.PixmapCache.getIcon("closehead")) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgCloseheadAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Close Heads") + + def __hgClosehead(self): + """ + Private slot used to close arbitrary heads. + """ + self.vcs.getExtensionObject("closehead")\ + .hgCloseheads(self.project.getProjectPath())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/__init__.py Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the closehead extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py Tue May 14 19:52:39 2019 +0200 @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the closehead extension interface. +""" + +from __future__ import unicode_literals + +import os + +from PyQt5.QtWidgets import QDialog + +from ..HgExtension import HgExtension +from ..HgDialog import HgDialog + + +class Closehead(HgExtension): + """ + Class implementing the strip extension interface. + """ + def __init__(self, vcs): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + """ + super(Closehead, self).__init__(vcs) + + def hgCloseheads(self, name, revisions=None): + """ + Public method to close arbitrary heads. + + @param name file/directory name + @type str + @param revisions revisions of branch heads to be closed + @type str + """ + # 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 + + message = "" + if not revisions: + from .HgCloseHeadSelectionDialog import HgCloseHeadSelectionDialog + dlg = HgCloseHeadSelectionDialog(self.vcs, name) + if dlg.exec_() == QDialog.Accepted: + revisions, message = dlg.getData() + + if not revisions: + # still no revisions given; abort... + return + + args = self.vcs.initCommand("close-head") + if not message: + if len(revisions) == 1: + message = self.tr("Revision <{0}> closed.").format( + revisions[0]) + else: + message = self.tr("Revisions <{0}> closed.").format( + ", ".join(revisions)) + args += ["--message", message] + for revision in revisions: + args += ["--rev", revision] + + dia = HgDialog(self.tr("Closing Heads"), self.vcs) + res = dia.startProcess(args, repodir) + if res: + dia.exec_()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue May 14 19:52:39 2019 +0200 @@ -293,6 +293,11 @@ self.__tagActTriggered) self.__tagAct.setToolTip(self.tr("Tag the selected revision")) + self.__closeHeadsAct = self.__actionsMenu.addAction( + UI.PixmapCache.getIcon("closehead"), self.tr("Close Heads"), + self.__closeHeadsActTriggered) + self.__closeHeadsAct.setToolTip(self.tr("Close the selected heads")) + self.__switchAct = self.__actionsMenu.addAction( UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch"), self.__switchActTriggered) @@ -879,6 +884,50 @@ self.__closedBranchesRevs.append( parts[-2].split(":", 1)[0]) + def __getHeads(self): + """ + Private method to get the list of all heads. + """ + self.__headRevisions = [] + errMsg = "" + + args = self.vcs.initCommand("heads") + args.append("--closed") + args.append("--template") + args.append("{rev}\n") + + output = "" + if self.__hgClient: + output, errMsg = self.__hgClient.runcommand(args) + else: + process = QProcess() + process.setWorkingDirectory(self.repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.vcs.getEncoding(), 'replace') + else: + if not finished: + errMsg = self.tr( + "The hg process did not finish within 30s.") + else: + errMsg = self.tr("Could not start the hg executable.") + + if errMsg: + E5MessageBox.critical( + self, + self.tr("Mercurial Error"), + errMsg) + + if output: + for line in output.splitlines(): + line = line.strip() + if line: + self.__headRevisions.append(line) + def __getRevisionOfTag(self, tag): """ Private method to get the revision of a tag. @@ -1204,6 +1253,7 @@ self.__started = True self.__identifyProject() self.__getClosedBranches() + self.__getHeads() self.__getLogEntries(noEntries=noEntries) def __procFinished(self, exitCode, exitStatus): @@ -1633,6 +1683,14 @@ self.vcs.isExtensionActive("gpg") and selectedItemsCount == 1) + if self.vcs.isExtensionActive("closehead"): + revs = [itm.text(self.RevisionColumn).strip().split(":", 1)[0] + for itm in self.logTree.selectedItems() + if not itm.data(0, self.__incomingRole)] + revs = [rev for rev in revs if rev in self.__headRevisions] + self.__closeHeadsAct.setEnabled(len(revs) > 0) + else: + self.__closeHeadsAct.setEnabled(False) self.actionsButton.setEnabled(True) elif self.initialCommandMode == "incoming" and self.projectMode: @@ -2196,6 +2254,24 @@ self.on_refreshButton_clicked() @pyqtSlot() + def __closeHeadsActTriggered(self): + """ + Private slot to close the selected head revisions. + """ + if self.vcs.isExtensionActive("closehead"): + revs = [itm.text(self.RevisionColumn).strip().split(":", 1)[0] + for itm in self.logTree.selectedItems() + if not itm.data(0, self.__incomingRole)] + revs = [rev for rev in revs if rev in self.__headRevisions] + if revs: + closeheadExtension = self.vcs.getExtensionObject("closehead") + if closeheadExtension is not None: + closeheadExtension.hgCloseheads( + self.repodir, revisions=revs) + + self.on_refreshButton_clicked() + + @pyqtSlot() def __switchActTriggered(self): """ Private slot to switch the working directory to the
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue May 14 19:52:39 2019 +0200 @@ -18,7 +18,7 @@ from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, \ QPoint from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QMenu + QTreeWidgetItem, QLineEdit, QMenu, QAbstractItemView from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -58,6 +58,7 @@ self.allTagsList = None self.__hgClient = vcs.getClient() self.__currentRevision = "" + self.__currentBranch = "" self.tagList.headerItem().setText(self.tagList.columnCount(), "") self.tagList.header().setSortIndicator(3, Qt.AscendingOrder) @@ -110,6 +111,9 @@ if not tags: self.setWindowTitle(self.tr("Mercurial Branches List")) self.tagList.headerItem().setText(2, self.tr("Status")) + if self.vcs.isExtensionActive("closehead"): + self.tagList.setSelectionMode( + QAbstractItemView.ExtendedSelection) self.activateWindow() self.tagsList = tagsList @@ -377,10 +381,10 @@ """ Private method to highlight the current branch with a bold font. """ - currentBranch = self.vcs.hgGetCurrentBranch(self.__repoDir) - if currentBranch: + self.__currentBranch = self.vcs.hgGetCurrentBranch(self.__repoDir) + if self.__currentBranch: items = self.tagList.findItems( - currentBranch, Qt.MatchCaseSensitive, 3) + self.__currentBranch, Qt.MatchCaseSensitive, 3) if len(items) == 1: font = items[0].font(3) font.setBold(True) @@ -427,13 +431,24 @@ UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch to"), self.__switchTo) else: - menu.addAction( + act = menu.addAction( UI.PixmapCache.getIcon("vcsSwitch.png"), self.tr("Switch to"), self.__switchTo) + act.setEnabled(itm.text(3) != self.__currentBranch) menu.addSeparator() - act = menu.addAction(self.tr("Close Branch"), - self.__closeBranch) - act.setEnabled(itm.text(3) != "default") + if self.vcs.isExtensionActive("closehead"): + act = menu.addAction( + UI.PixmapCache.getIcon("closehead"), + self.tr("Close Branches"), self.__closeBranchHeads) + act.setEnabled(len([ + itm for itm in self.tagList.selectedItems() + if itm.text(3) != "default" + ]) > 0) + else: + act = menu.addAction( + UI.PixmapCache.getIcon("closehead"), + self.tr("Close Branch"), self.__closeBranch) + act.setEnabled(itm.text(3) != "default") menu.popup(self.tagList.mapToGlobal(pos)) def __switchTo(self): @@ -493,3 +508,23 @@ revision=currentBranch) self.on_refreshButton_clicked() + + def __closeBranchHeads(self): + """ + Private slot to close the selected branches. + """ + branches = [itm.text(3) for itm in self.tagsList.selectedItems() + if itm.text(3) != "default"] + + from UI.DeleteFilesConfirmationDialog import \ + DeleteFilesConfirmationDialog + dlg = DeleteFilesConfirmationDialog( + self.parent(), + self.tr("Close Branches"), + self.tr( + "Do you really want to close all listed branches?"), + branches) + yes = dlg.exec_() == QDialog.Accepted + if yes: + self.vcs.getExtensionObject("closehead").hgCloseheads( + self.__repoDir, branches)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Tue May 14 19:52:39 2019 +0200 @@ -199,6 +199,13 @@ if "largefiles" in self.__config["extensions"]: del self.__config["extensions"]["largefiles"] self.__config["extensions"]["#largefiles"] = "" + + if self.closeheadCheckBox.isChecked() and self.__version >= (4, 8, 0): + self.__config["extensions"]["closehead"] = "" + else: + if "closehead" in self.__config["extensions"]: + del self.__config["extensions"]["closehead"] + self.__config["extensions"]["#closehead"] = "" ################################################################### ## http_proxy section ################################################################### @@ -335,6 +342,9 @@ "strip" in self.__config["extensions"]) self.histeditCheckBox.setChecked( "histedit" in self.__config["extensions"]) + self.closeheadCheckBox.setChecked( + "closehead" in self.__config["extensions"]) + self.closeheadCheckBox.setEnabled(self.__version >= (4, 8, 0)) # step 3: extract large files information if "largefiles" in self.__config:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Tue May 14 19:52:39 2019 +0200 @@ -20,7 +20,7 @@ <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>3</number> + <number>1</number> </property> <widget class="QWidget" name="tab"> <attribute name="title"> @@ -121,6 +121,16 @@ </property> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0"> + <widget class="QCheckBox" name="closeheadCheckBox"> + <property name="toolTip"> + <string>Select to activate the closehead extension</string> + </property> + <property name="text"> + <string>Close Head</string> + </property> + </widget> + </item> + <item row="0" column="1"> <widget class="QCheckBox" name="fetchCheckBox"> <property name="toolTip"> <string>Select to activate the fetch extension</string> @@ -130,7 +140,7 @@ </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="0"> <widget class="QCheckBox" name="gpgCheckBox"> <property name="toolTip"> <string>Select to activate the GPG extension</string> @@ -140,7 +150,7 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="1" column="1"> <widget class="QCheckBox" name="histeditCheckBox"> <property name="toolTip"> <string>Select to activate the histedit extension</string> @@ -150,7 +160,7 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="0"> <widget class="QCheckBox" name="largefilesCheckBox"> <property name="toolTip"> <string>Select to activate the largefiles extension</string> @@ -160,7 +170,7 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="2" column="1"> <widget class="QCheckBox" name="purgeCheckBox"> <property name="toolTip"> <string>Select to activate the Purge extension</string> @@ -170,7 +180,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="0"> <widget class="QCheckBox" name="queuesCheckBox"> <property name="toolTip"> <string>Select to activate the queues extension</string> @@ -180,7 +190,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="3" column="1"> <widget class="QCheckBox" name="rebaseCheckBox"> <property name="toolTip"> <string>Select to activate the rebase extension</string> @@ -190,7 +200,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="4" column="0"> <widget class="QCheckBox" name="shelveCheckBox"> <property name="toolTip"> <string>Select to activate the shelve extension</string> @@ -200,7 +210,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="4" column="1"> <widget class="QCheckBox" name="stripCheckBox"> <property name="toolTip"> <string>Select to activate the strip extension</string> @@ -672,6 +682,7 @@ <tabstop>tabWidget</tabstop> <tabstop>userNameEdit</tabstop> <tabstop>emailEdit</tabstop> + <tabstop>closeheadCheckBox</tabstop> <tabstop>fetchCheckBox</tabstop> <tabstop>gpgCheckBox</tabstop> <tabstop>histeditCheckBox</tabstop>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue May 14 19:52:39 2019 +0200 @@ -49,6 +49,7 @@ from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper from .StripExtension.ProjectHelper import StripProjectHelper from .HisteditExtension.ProjectHelper import HisteditProjectHelper + from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper self.__extensions = { "mq": QueuesProjectHelper(), "fetch": FetchProjectHelper(), @@ -59,6 +60,7 @@ "largefiles": LargefilesProjectHelper(), "strip": StripProjectHelper(), "histedit": HisteditProjectHelper(), + "closehead": CloseheadProjectHelper(), } self.__extensionMenuTitles = {} @@ -554,6 +556,7 @@ self.hgPushBranchAct = E5Action( self.tr('Push new branch'), + UI.PixmapCache.getIcon("vcsCommit.png"), self.tr('Push new branch'), 0, 0, self, 'mercurial_push_branch') self.hgPushBranchAct.setStatusTip(self.tr( @@ -570,6 +573,7 @@ self.hgCloseBranchAct = E5Action( self.tr('Close branch'), + UI.PixmapCache.getIcon("closehead"), self.tr('Close branch'), 0, 0, self, 'mercurial_close_branch') self.hgCloseBranchAct.setStatusTip(self.tr( @@ -1620,6 +1624,8 @@ self.extensionMenus[extensionName].menu()\ .isTearOffMenuVisible(): self.extensionMenus[extensionName].menu().hideTearOffMenu() + if self.vcs.version < (4, 8, 0): + self.extensionMenus["closehead"].setEnabled(False) def __hgExtendedDiff(self): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py Tue May 14 19:52:39 2019 +0200 @@ -19,11 +19,14 @@ """ Class implementing a dialog to enter the data for a shelve operation. """ - def __init__(self, parent=None): + def __init__(self, version, parent=None): """ Constructor - @param parent reference to the parent widget (QWidget) + @param version Mercurial version + @type tuple of three int + @param parent reference to the parent widget + @type QWidget """ super(HgShelveDataDialog, self).__init__(parent) self.setupUi(self) @@ -31,6 +34,10 @@ self.__initialDateTime = QDateTime.currentDateTime() self.dateTimeEdit.setDateTime(self.__initialDateTime) + if version < (5, 0, 0): + self.keepCheckBox.setChecked(False) + self.keepCheckBox.hide() + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) @@ -38,9 +45,10 @@ """ Public method to get the user data. - @return tuple containing the name (string), date (QDateTime), - message (string) and a flag indicating to add/remove - new/missing files (boolean) + @return tuple containing the name, date, message, a flag indicating + to add/remove new/missing files and a flag indicating to keep the + shelved changes in the working directory + @rtype tuple of (str, QDateTime, str, bool, bool) """ if self.dateTimeEdit.dateTime() != self.__initialDateTime: dateTime = self.dateTimeEdit.dateTime() @@ -51,4 +59,5 @@ dateTime, self.messageEdit.text(), self.addRemoveCheckBox.isChecked(), + self.keepCheckBox.isChecked(), )
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui Tue May 14 19:52:39 2019 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>500</width> - <height>170</height> + <height>167</height> </rect> </property> <property name="windowTitle"> @@ -93,6 +93,16 @@ </widget> </item> <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="toolTip"> + <string>Select to shelve, but keep the changes in the working directory</string> + </property> + <property name="text"> + <string>Shelve, but keep changes</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum>
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Tue May 14 19:52:39 2019 +0200 @@ -101,9 +101,9 @@ res = False from .HgShelveDataDialog import HgShelveDataDialog - dlg = HgShelveDataDialog() + dlg = HgShelveDataDialog(self.vcs.version) if dlg.exec_() == QDialog.Accepted: - shelveName, dateTime, message, addRemove = dlg.getData() + shelveName, dateTime, message, addRemove, keep = dlg.getData() args = self.vcs.initCommand("shelve") if shelveName: @@ -117,6 +117,8 @@ if dateTime.isValid(): args.append("--date") args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) + if self.vcs.version >= (5, 0, 0) and keep: + args.append("--keep") args.append("-v") if isinstance(name, list):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sun May 12 15:31:23 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Tue May 14 19:52:39 2019 +0200 @@ -147,6 +147,7 @@ from .LargefilesExtension.largefiles import Largefiles from .StripExtension.strip import Strip from .HisteditExtension.histedit import Histedit + from .CloseheadExtension.closehead import Closehead self.__extensions = { "mq": Queues(self), "fetch": Fetch(self), @@ -157,6 +158,7 @@ "largefiles": Largefiles(self), "strip": Strip(self), "histedit": Histedit(self), + "closehead": Closehead(self), } def getPlugin(self): @@ -3441,6 +3443,8 @@ extensionName = \ line.split("=", 1)[0].strip().split(".")[-1].strip() self.__activeExtensions.append(extensionName) + if self.version < (4, 8, 0) and "closehead" in self.__activeExtensions: + self.__activeExtensions.remove["closehead"] if activeExtensions != sorted(self.__activeExtensions): self.activeExtensionsChanged.emit()
--- a/eric6/i18n/eric6_cs.ts Sun May 12 15:31:23 2019 +0200 +++ b/eric6/i18n/eric6_cs.ts Tue May 14 19:52:39 2019 +0200 @@ -2951,6 +2951,42 @@ </message> </context> <context> + <name>Closehead</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="63"/> + <source>Revision <{0}> closed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="66"/> + <source>Revisions <{0}> closed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="72"/> + <source>Closing Heads</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CloseheadProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="74"/> + <source>Close Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="40"/> + <source>Close arbitrary heads without checking them out first</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="43"/> + <source><b>Close Heads</b><p>This closes arbitrary heads without the need to check them out first.</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>CodeDocumentationViewer</name> <message> <location filename="../UI/CodeDocumentationViewer.py" line="182"/> @@ -30839,447 +30875,447 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1771"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <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="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/> <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="372"/> <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="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="628"/> <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="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="678"/> <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="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="747"/> <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="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1348"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1532"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1979"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <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="2337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/> <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="2362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <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="2410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <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="2219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <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="2529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/> <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="2787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> <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="2546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <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="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="542"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3376"/> <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="3517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2936"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3088"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> <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="3225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3227"/> <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="3296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/> <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="3296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3267"/> <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="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <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="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/> <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="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <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="3141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3143"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="941"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3639"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1085"/> <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="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <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="1097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <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="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>Canceling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -32304,6 +32340,34 @@ </message> </context> <context> + <name>HgCloseHeadSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="14"/> + <source>Close Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="23"/> + <source>Select heads to be closed:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="46"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="51"/> + <source>Branch</source> + <translation type="unfinished">Větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="59"/> + <source>Commit Message:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -33748,27 +33812,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="959"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -33839,12 +33903,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2230"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -33869,27 +33933,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="304"/> <source>Switch the working directory to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327"/> <source>Pull Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Pull large files for selected revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -33934,12 +33998,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> @@ -33964,97 +34028,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2433"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Pull changes from a remote repository</source> <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="338"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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="344"/> + <source>Push All Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347"/> + <source>Push all changes to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2398"/> + <source>Fetch Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2479"/> + <source>Strip Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="333"/> - <source>Push Selected Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> - <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="339"/> - <source>Push All Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> - <source>Push all changes to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2314"/> - <source>Fetch Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2395"/> - <source>Strip Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="390"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="304"/> - <source>Define Bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="307"/> - <source>Bookmark the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> - <source>Move Bookmark...</source> + <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312"/> + <source>Bookmark the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> + <source>Move Bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/> <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="2204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2288"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34099,118 +34163,118 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352"/> <source>Create Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="355"/> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357"/> <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="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> - <source>Apply the currently viewed changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="369"/> - <source>Sign Revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="372"/> - <source>Add a signature for the selected revisions</source> + <source>Apply the currently viewed changegroup file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="374"/> - <source>Verify Signatures</source> + <source>Sign Revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> + <source>Add a signature for the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="379"/> + <source>Verify Signatures</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <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="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395"/> <source>Select All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="397"/> <source>Deselect All Entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1555"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1566"/> <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="1642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1704"/> <source>Pull Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/> <source>Fetch Selected Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2767"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2783"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808"/> <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="2867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2918"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/> <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="2867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/> <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> @@ -34220,7 +34284,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2756"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -34229,6 +34293,16 @@ <source>Mercurial Full Log</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> + <source>Close Heads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299"/> + <source>Close the selected heads</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -34707,1437 +34781,1437 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <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="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> <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="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <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="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> <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="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <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="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> <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="172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <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="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> <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="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <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="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> <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="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <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="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> <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="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <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="228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> <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="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <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="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> <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="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <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="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> <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="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <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="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <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="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <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="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <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="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> <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="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <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="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> <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="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <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="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> <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="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <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="397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399"/> <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="404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <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="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <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="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <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="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> <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="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> <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="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> <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="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <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="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <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="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <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="578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <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="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <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="615"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <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="629"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <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="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <source>Configure...</source> + <translation>Konfigurovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> <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="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <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="704"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Show paths...</source> - <translation>Zobrazit cesty...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <source>Show paths...</source> + <translation>Zobrazit cesty...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <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="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <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="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="732"/> - <source>Recover</source> - <translation>Zotavit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> - <source>Recover...</source> - <translation>Zotavit...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Recover</source> + <translation>Zotavit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Recover...</source> + <translation>Zotavit...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <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="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <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="760"/> - <source>Create .hgignore</source> - <translation>Vytvořit .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Create .hgignore</source> + <translation>Vytvořit .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <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="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <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="1833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <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="1342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <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="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <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="585"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <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="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <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="822"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <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="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <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="836"/> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <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="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> - <source>Reset</source> - <translation>Reset</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Reset</source> + <translation>Reset</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> - <source>Identify...</source> - <translation>Identifikovat...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Identify...</source> + <translation>Identifikovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <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="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> <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="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <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="878"/> - <source>Back out changeset</source> - <translation>Vycouvat z množiny změn</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <source>Back out changeset</source> + <translation>Vycouvat z množiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <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="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <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="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <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="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> <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="919"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <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="1333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> <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="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Push new 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="562"/> <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="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <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="892"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <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="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <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="673"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <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="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="688"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show the combined configuration settings from all configuration files</source> + <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <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="700"/> <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="850"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <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="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <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="1349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> <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="964"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <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="1929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> <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="995"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> <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="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <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="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <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="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <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="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <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="1054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> <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="1420"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <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="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> <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="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <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="1308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <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="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> <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="420"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Cancel uncommitted merge</b><p>This cancels 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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <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="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <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="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <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="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> <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="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> <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="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> <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="1179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> <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="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> <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="1228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> <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="1379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <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="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <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="483"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> <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="488"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> <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="443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> <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="1507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> <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="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> <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="1261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <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="1269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> <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="1010"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> <source>Stop the interrupted copying session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> - <source>Abort Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <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="1425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> @@ -37507,6 +37581,16 @@ <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="98"/> + <source>Select to shelve, but keep the changes in the working directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="101"/> + <source>Shelve, but keep changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgShelvesSelectionDialog</name> @@ -38319,32 +38403,32 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> <source>Mercurial Branches List</source> <translation>Mercurial sezam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="113"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="160"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="290"/> <source>active</source> <translation>aktivní</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="295"/> <source>yes</source> <translation>ano</translation> </message> @@ -38359,35 +38443,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="434"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="489"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="463"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="463"/> <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/HgTagBranchListDialog.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="482"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="474"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="489"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="521"/> + <source>Close Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="521"/> + <source>Do you really want to close all listed branches?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgTagDialog</name> @@ -38527,22 +38621,22 @@ <context> <name>HgUserConfigDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="543"/> <source>Delete Host Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="543"/> <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="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="713"/> <source>Edit User Configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="713"/> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished"></translation> </message> @@ -38597,287 +38691,287 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> <source>Select to activate the fetch extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/> - <source>Fetch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> - <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 Purge extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> - <source>Purge</source> + <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"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> - <source>Select to activate the queues extension</source> + <source>Select to activate the Purge extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> - <source>Queues</source> + <source>Purge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> - <source>Select to activate the rebase extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> - <source>Rebase</source> + <source>Queues</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="196"/> - <source>Select to activate the shelve extension</source> + <source>Select to activate the rebase 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="228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="238"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="245"/> <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="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="251"/> <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>Enter file patterns for large files</source> + <source>Patterns:</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="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="310"/> <source>Enter the name of the user cache directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="334"/> <source>Network</source> <translation type="unfinished">Síť</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> <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>Enter Proxy Hostname</source> - <translation type="unfinished"></translation> + <source>Host:</source> + <translation type="unfinished">Host:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="365"/> - <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> + <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> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> - <source>Enter Proxy Username</source> + <source>User:</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="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="399"/> <source>Enter the password for the network proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> <source>Enter Proxy Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="412"/> <source>Bypass:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="419"/> <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="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="425"/> <source>Enter hosts bypassing the proxy separated by comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="467"/> <source>Host Fingerprints</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="591"/> <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="495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="505"/> <source>Delete a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="502"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="512"/> <source>Edit a host fingerprint entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="649"/> <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="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="652"/> <source>Open configuration file in editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="216"/> <source>Select to activate the strip extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="219"/> <source>Strip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> <source>Select to activate the histedit extension</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> <source>Histedit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="449"/> <source>Security</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="537"/> <source>Disable TLS 1.0 Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="546"/> <source>Minimum Protocol:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="553"/> <source>Select the minimum protocol to use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="575"/> <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="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="613"/> <source>Delete a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="620"/> <source>Edit a host minimum protocol entry</source> <translation type="unfinished"></translation> </message> @@ -38902,15 +38996,25 @@ <translation type="unfinished">Výchozí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655"/> <source>Delete Host Minimum Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655"/> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/> + <source>Select to activate the closehead extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/> + <source>Close Head</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgUserConfigHostFingerprintDialog</name> @@ -64338,47 +64442,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="129"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="179"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="204"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="255"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="265"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="301"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="293"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -88861,46 +88965,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1414"/> <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="2052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <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="2062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/> <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="1432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <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="2047"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <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="2067"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2073"/> <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> @@ -88908,12 +89012,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="2057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -88924,13 +89028,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036"/> <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="2039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2041"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_de.ts Sun May 12 15:31:23 2019 +0200 +++ b/eric6/i18n/eric6_de.ts Tue May 14 19:52:39 2019 +0200 @@ -2961,6 +2961,42 @@ </message> </context> <context> + <name>Closehead</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="63"/> + <source>Revision <{0}> closed.</source> + <translation>Revision <{0}> geschlossen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="66"/> + <source>Revisions <{0}> closed.</source> + <translation>Revisionen <{0}> geschlossen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="72"/> + <source>Closing Heads</source> + <translation>Köpfe schließen</translation> + </message> +</context> +<context> + <name>CloseheadProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="74"/> + <source>Close Heads</source> + <translation>Köpfe schließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="40"/> + <source>Close arbitrary heads without checking them out first</source> + <translation>Schließe beliebige Köpfe ohne sie zuerst auszuchecken</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py" line="43"/> + <source><b>Close Heads</b><p>This closes arbitrary heads without the need to check them out first.</p></source> + <translation><b>Köpfe schließen</b><p>Dies schließt beliebige Köpfe ohne die Notwendigkeit, sie zuerst auszuchecken.</p></translation> + </message> +</context> +<context> <name>CodeDocumentationViewer</name> <message> <location filename="../UI/CodeDocumentationViewer.py" line="182"/> @@ -30862,447 +30898,447 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1771"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <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="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/> <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="372"/> <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="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="628"/> <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="676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="678"/> <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="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="747"/> <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="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1046"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1348"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1530"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1532"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/> <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="1979"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/> <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="2190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/> <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="2337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/> <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="2362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/> <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="2410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <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="2219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2733"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <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="2529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/> <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="2787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <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="2814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2807"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/> <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="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="542"/> <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="3517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3376"/> <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="3517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/> <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="2882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2934"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2936"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3088"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> <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="3225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3227"/> <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="3296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/> <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="3296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3298"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3267"/> <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="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/> <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="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/> <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="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <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="3141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3143"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/> <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="1772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="941"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3639"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/> <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="3668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/> <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="3849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/> <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="3881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/> <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="3893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> <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="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1085"/> <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="1092"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> <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="1097"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1099"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/> - <source>Marking as 'unresolved'</source> - <translation>Markiere als 'nicht aufgelöst'</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/> <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="2157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>Canceling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> @@ -32330,6 +32366,34 @@ </message> </context> <context> + <name>HgCloseHeadSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="14"/> + <source>Close Heads</source> + <translation>Köpfe schließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="23"/> + <source>Select heads to be closed:</source> + <translation>Wähle zu schließende Köpfe:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="46"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="51"/> + <source>Branch</source> + <translation>Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui" line="59"/> + <source>Commit Message:</source> + <translation>Änderungsbeschreibung:</translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -33794,27 +33858,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="959"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="913"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -33885,12 +33949,12 @@ <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2230"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -33915,27 +33979,27 @@ <translation>Ausgewählte Revision mit einer Marke versehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="304"/> <source>Switch the working directory to the selected revision</source> <translation>Schaltet das Arbeitsverzeichnis auf die ausgewählte Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="327"/> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="329"/> <source>Pull large files for selected revisions</source> <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> @@ -33980,12 +34044,12 @@ <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> @@ -34010,97 +34074,97 @@ <translation>Geheim</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2433"/> <source>Pull Changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="338"/> + <source>Push Selected Changes</source> + <translation>Ausgewählte Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="341"/> + <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="344"/> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347"/> + <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="2398"/> + <source>Fetch Changes</source> + <translation>Änderungen abholen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2479"/> + <source>Strip Changesets</source> + <translation>Änderungssätze löschen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="333"/> - <source>Push Selected Changes</source> - <translation>Ausgewählte Änderungen hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="336"/> - <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="339"/> - <source>Push All Changes</source> - <translation>Alle Änderungen hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="342"/> - <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="2314"/> - <source>Fetch Changes</source> - <translation>Änderungen abholen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2395"/> - <source>Strip Changesets</source> - <translation>Änderungssätze löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="328"/> <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="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="390"/> <source>Strip changesets from a repository</source> <translation>Änderungssätze aus einem Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="304"/> - <source>Define Bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="307"/> - <source>Bookmark the selected revision</source> - <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="309"/> - <source>Move Bookmark...</source> - <translation>Lesezeichen verschieben …</translation> + <source>Define Bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="312"/> + <source>Bookmark the selected revision</source> + <translation>Lesezeichen für die ausgewählte Revision erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> + <source>Move Bookmark...</source> + <translation>Lesezeichen verschieben …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> <source>Move bookmark to the selected revision</source> <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/> <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="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/> <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="2204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2288"/> <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> @@ -34145,119 +34209,119 @@ <translation>Führe das Arbeitsverzeichnis mit dem gewählten Änderungssatz zusammen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352"/> <source>Create Changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="355"/> <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="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357"/> <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="2487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="364"/> - <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="369"/> - <source>Sign Revisions</source> - <translation>Revisionen signieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="372"/> - <source>Add a signature for the selected revisions</source> - <translation>Den ausgewählten Revisionen eine Signatur hinzufügen</translation> + <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="374"/> - <source>Verify Signatures</source> - <translation>Signaturen verifizieren</translation> + <source>Sign Revisions</source> + <translation>Revisionen signieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="377"/> + <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="379"/> + <source>Verify Signatures</source> + <translation>Signaturen verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="382"/> <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="390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="395"/> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="397"/> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1555"/> <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="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1566"/> <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="1642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1704"/> <source>Pull Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/> <source>Fetch Selected Changes</source> <translation>Ausgewählte Änderungen herunterladen und zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2683"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2767"/> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2783"/> <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="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2834"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2918"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/> <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="2867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/> <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> @@ -34267,7 +34331,7 @@ <translation><a href="save:me">Speichern</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2756"/> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> @@ -34276,6 +34340,16 @@ <source>Mercurial Full Log</source> <translation>Mercurial-Log (vollständig)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="296"/> + <source>Close Heads</source> + <translation>Köpfe schließen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="299"/> + <source>Close the selected heads</source> + <translation>Schließe die ausgewählten Köpfe</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -34760,1437 +34834,1437 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> <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="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> <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="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> <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="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> <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="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> <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="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> <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="172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> <source>&Update from repository</source> <translation>&Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> <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="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> <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="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>Commit changes to repository</source> <translation>Änderungen in Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>&Commit changes to repository...</source> <translation>&Änderungen in Repository einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> <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="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> <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="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <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="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> <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="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> <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="228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> <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="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <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="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> <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="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <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="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> <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="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <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="305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <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="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <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="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> <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="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="349"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <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="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> <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="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> <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="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> <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="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="381"/> <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="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> <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="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <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="397"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399"/> <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="404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> <source>Mer&ge changes...</source> <translation>Änderungen &zusammenführen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <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="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> <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="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="496"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <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="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> <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="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> <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="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> <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="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <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="547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <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="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <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="578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <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="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <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="615"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <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="629"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <source>Execute command</source> + <translation>Befehl ausführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> <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="636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <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="644"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> <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="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <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="704"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="704"/> - <source>Show paths...</source> - <translation>Pfade anzeigen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <source>Show paths...</source> + <translation>Pfade anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <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="711"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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="718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <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="725"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="732"/> - <source>Recover</source> - <translation>Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> - <source>Recover...</source> - <translation>Transaktion zurücksetzen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Recover</source> + <translation>Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Recover...</source> + <translation>Transaktion zurücksetzen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> <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="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <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="760"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="767"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <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="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <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="1833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <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="1342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <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="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <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="585"/> - <source>Show current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <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="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <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="822"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <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="829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <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="836"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <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="843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <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="850"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="864"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <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="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <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="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> - <source>Identify</source> - <translation>Identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> - <source>Identify...</source> - <translation>Identifizieren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Identify</source> + <translation>Identifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Identify...</source> + <translation>Identifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <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="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> <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="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> <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="878"/> - <source>Back out changeset</source> - <translation>Änderungssatz umkehren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <source>Back out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <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="885"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <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="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243"/> <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="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> <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="1333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> - <source>Serve project repository...</source> - <translation>Server für Projektrepository...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Serve project repository...</source> + <translation>Server für Projektrepository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <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="1650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> <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="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="559"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> <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="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <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="892"/> - <source>Rollback last transaction</source> - <translation>Letzte Transaktion zurücksetzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <source>Rollback last transaction</source> + <translation>Letzte Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Edit user configuration</source> - <translation>Nutzerkonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> - <source>Edit user configuration...</source> - <translation>Nutzerkonfiguration editieren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <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="666"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <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="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <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="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="688"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <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="700"/> <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="850"/> - <source>Skip...</source> - <translation>Überspringen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Skip...</source> + <translation>Überspringen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <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="1889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> <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="941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <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="1349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> <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="964"/> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964"/> - <source>Change Phase...</source> - <translation>Phase ändern...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> <source>Change the phase of revisions</source> <translation>Ändert die Phase von Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <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="1929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <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="986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> <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="995"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> <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="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> <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="1944"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <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="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <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="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1039"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <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="1054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> <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="1420"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> <source>Show &status...</source> <translation>Status an&zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Show Summary</source> <translation>Übersichtsinformationen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Show summary...</source> <translation>Übersichtsinformationen anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <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="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> <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="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1070"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> <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="1078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> <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="899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <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="1308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> <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="308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="310"/> <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="420"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Cancel uncommitted merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Cancel 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="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Cancel uncommitted merge</b><p>This cancels 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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <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="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> <source>Define bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> <source>Define bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> <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="1109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> <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="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> <source>Delete bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> <source>Delete bookmark...</source> <translation>Lesezeichen löschen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> <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="1124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> <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="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Rename bookmark</source> <translation>Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Rename bookmark...</source> <translation>Lesezeichen umbenennen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> <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="1139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> <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>
