Tue, 31 May 2011 16:35:45 +0200
Added support for the Mercurial rebase extension.
--- a/APIs/Python3/eric5.api Tue May 31 16:15:55 2011 +0200 +++ b/APIs/Python3/eric5.api Tue May 31 16:35:45 2011 +0200 @@ -3590,6 +3590,32 @@ eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueShowPatch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.shutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues?1(vcs) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_bookmark1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_bookmark1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_bookmark2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_bookmark2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_branch1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_branch1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_branch2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_branch2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_id1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_id1Edit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_id2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_id2Edit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag1Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag1Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Button_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Combo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initActions?4() +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initMenu?4(mainMenu) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.menuTitle?4() +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper?1() +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase.hgRebase?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase.hgRebaseAbort?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase.hgRebaseContinue?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase?1(vcs) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initMenu?4(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.menuTitle?4()
--- a/Documentation/Help/source.qhp Tue May 31 16:15:55 2011 +0200 +++ b/Documentation/Help/source.qhp Tue May 31 16:35:45 2011 +0200 @@ -401,6 +401,11 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues" ref="eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html" /> </section> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html"> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html" /> + </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html" /> @@ -9568,6 +9573,44 @@ <keyword name="MercurialPage (Constructor)" id="MercurialPage (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.__init__" /> <keyword name="MercurialPage.on_configButton_clicked" id="MercurialPage.on_configButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.on_configButton_clicked" /> <keyword name="MercurialPage.save" id="MercurialPage.save" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.save" /> + <keyword name="RebaseExtension (Package)" id="RebaseExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html" /> + <keyword name="RebaseProjectHelper" id="RebaseProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper" /> + <keyword name="RebaseProjectHelper (Constructor)" id="RebaseProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.__init__" /> + <keyword name="RebaseProjectHelper.__hgRebase" id="RebaseProjectHelper.__hgRebase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.__hgRebase" /> + <keyword name="RebaseProjectHelper.__hgRebaseAbort" id="RebaseProjectHelper.__hgRebaseAbort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.__hgRebaseAbort" /> + <keyword name="RebaseProjectHelper.__hgRebaseContinue" id="RebaseProjectHelper.__hgRebaseContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.__hgRebaseContinue" /> + <keyword name="RebaseProjectHelper.initActions" id="RebaseProjectHelper.initActions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.initActions" /> + <keyword name="RebaseProjectHelper.initMenu" id="RebaseProjectHelper.initMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.initMenu" /> + <keyword name="RebaseProjectHelper.menuTitle" id="RebaseProjectHelper.menuTitle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html#RebaseProjectHelper.menuTitle" /> + <keyword name="rebase (Module)" id="rebase (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html" /> + <keyword name="Rebase" id="Rebase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html#Rebase" /> + <keyword name="Rebase (Constructor)" id="Rebase (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html#Rebase.__init__" /> + <keyword name="Rebase.hgRebase" id="Rebase.hgRebase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html#Rebase.hgRebase" /> + <keyword name="Rebase.hgRebaseAbort" id="Rebase.hgRebaseAbort" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html#Rebase.hgRebaseAbort" /> + <keyword name="Rebase.hgRebaseContinue" id="Rebase.hgRebaseContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html#Rebase.hgRebaseContinue" /> + <keyword name="HgRebaseDialog (Module)" id="HgRebaseDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html" /> + <keyword name="HgRebaseDialog" id="HgRebaseDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog" /> + <keyword name="HgRebaseDialog (Constructor)" id="HgRebaseDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.__init__" /> + <keyword name="HgRebaseDialog.__getRevision" id="HgRebaseDialog.__getRevision" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.__getRevision" /> + <keyword name="HgRebaseDialog.__updateOK" id="HgRebaseDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.__updateOK" /> + <keyword name="HgRebaseDialog.getData" id="HgRebaseDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.getData" /> + <keyword name="HgRebaseDialog.on_bookmark1Button_toggled" id="HgRebaseDialog.on_bookmark1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_bookmark1Button_toggled" /> + <keyword name="HgRebaseDialog.on_bookmark1Combo_editTextChanged" id="HgRebaseDialog.on_bookmark1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_bookmark1Combo_editTextChanged" /> + <keyword name="HgRebaseDialog.on_bookmark2Button_toggled" id="HgRebaseDialog.on_bookmark2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_bookmark2Button_toggled" /> + <keyword name="HgRebaseDialog.on_bookmark2Combo_editTextChanged" id="HgRebaseDialog.on_bookmark2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_bookmark2Combo_editTextChanged" /> + <keyword name="HgRebaseDialog.on_branch1Button_toggled" id="HgRebaseDialog.on_branch1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_branch1Button_toggled" /> + <keyword name="HgRebaseDialog.on_branch1Combo_editTextChanged" id="HgRebaseDialog.on_branch1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_branch1Combo_editTextChanged" /> + <keyword name="HgRebaseDialog.on_branch2Button_toggled" id="HgRebaseDialog.on_branch2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_branch2Button_toggled" /> + <keyword name="HgRebaseDialog.on_branch2Combo_editTextChanged" id="HgRebaseDialog.on_branch2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_branch2Combo_editTextChanged" /> + <keyword name="HgRebaseDialog.on_id1Button_toggled" id="HgRebaseDialog.on_id1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_id1Button_toggled" /> + <keyword name="HgRebaseDialog.on_id1Edit_textChanged" id="HgRebaseDialog.on_id1Edit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_id1Edit_textChanged" /> + <keyword name="HgRebaseDialog.on_id2Button_toggled" id="HgRebaseDialog.on_id2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_id2Button_toggled" /> + <keyword name="HgRebaseDialog.on_id2Edit_textChanged" id="HgRebaseDialog.on_id2Edit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_id2Edit_textChanged" /> + <keyword name="HgRebaseDialog.on_tag1Button_toggled" id="HgRebaseDialog.on_tag1Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_tag1Button_toggled" /> + <keyword name="HgRebaseDialog.on_tag1Combo_editTextChanged" id="HgRebaseDialog.on_tag1Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_tag1Combo_editTextChanged" /> + <keyword name="HgRebaseDialog.on_tag2Button_toggled" id="HgRebaseDialog.on_tag2Button_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_tag2Button_toggled" /> + <keyword name="HgRebaseDialog.on_tag2Combo_editTextChanged" id="HgRebaseDialog.on_tag2Combo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html#HgRebaseDialog.on_tag2Combo_editTextChanged" /> <keyword name="FetchExtension (Package)" id="FetchExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html" /> <keyword name="HgFetchDialog (Module)" id="HgFetchDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html" /> <keyword name="HgFetchDialog" id="HgFetchDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html#HgFetchDialog" /> @@ -11172,6 +11215,9 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesRenamePatchDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html</file> @@ -11533,6 +11579,7 @@ <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html</file> + <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsMercurial.html</file> <file>index-eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,334 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog</h1> +<p> +Module implementing a dialog to enter the data for a rebase session. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgRebaseDialog">HgRebaseDialog</a></td> +<td>Class implementing a dialog to enter the data for a rebase session.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgRebaseDialog" ID="HgRebaseDialog"></a> +<h2>HgRebaseDialog</h2> +<p> + Class implementing a dialog to enter the data for a rebase session. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgRebaseDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgRebaseDialog.__init__">HgRebaseDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgRebaseDialog.__getRevision">__getRevision</a></td> +<td>Private method to generate the revision.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.getData">getData</a></td> +<td>Private method to retrieve the data for the rebase session.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_bookmark1Button_toggled">on_bookmark1Button_toggled</a></td> +<td>Private slot to handle changes of the Bookmark1 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_bookmark1Combo_editTextChanged">on_bookmark1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark1 combo.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_bookmark2Button_toggled">on_bookmark2Button_toggled</a></td> +<td>Private slot to handle changes of the Bookmark2 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_bookmark2Combo_editTextChanged">on_bookmark2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark2 combo.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_branch1Button_toggled">on_branch1Button_toggled</a></td> +<td>Private slot to handle changes of the Branch1 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_branch1Combo_editTextChanged">on_branch1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch1 combo.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_branch2Button_toggled">on_branch2Button_toggled</a></td> +<td>Private slot to handle changes of the Branch2 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_branch2Combo_editTextChanged">on_branch2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch2 combo.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_id1Button_toggled">on_id1Button_toggled</a></td> +<td>Private slot to handle changes of the ID1 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_id1Edit_textChanged">on_id1Edit_textChanged</a></td> +<td>Private slot to handle changes of the ID1 edit.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_id2Button_toggled">on_id2Button_toggled</a></td> +<td>Private slot to handle changes of the ID2 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_id2Edit_textChanged">on_id2Edit_textChanged</a></td> +<td>Private slot to handle changes of the ID2 edit.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_tag1Button_toggled">on_tag1Button_toggled</a></td> +<td>Private slot to handle changes of the Tag1 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag1 combo.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_tag2Button_toggled">on_tag2Button_toggled</a></td> +<td>Private slot to handle changes of the Tag2 select button.</td> +</tr><tr> +<td><a href="#HgRebaseDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag2 combo.</td> +</tr> +</table> +<a NAME="HgRebaseDialog.__init__" ID="HgRebaseDialog.__init__"></a> +<h4>HgRebaseDialog (Constructor)</h4> +<b>HgRebaseDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgRebaseDialog.__getRevision" ID="HgRebaseDialog.__getRevision"></a> +<h4>HgRebaseDialog.__getRevision</h4> +<b>__getRevision</b>(<i>no</i>) +<p> + Private method to generate the revision. +</p><dl> +<dt><i>no</i></dt> +<dd> +revision number to generate (1 or 2) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +revision (string) +</dd> +</dl><a NAME="HgRebaseDialog.__updateOK" ID="HgRebaseDialog.__updateOK"></a> +<h4>HgRebaseDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgRebaseDialog.getData" ID="HgRebaseDialog.getData"></a> +<h4>HgRebaseDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Private method to retrieve the data for the rebase session. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with a source indicator of "S" or "B", the source revision, the + destination revision, a flag indicating to collapse, a flag indicating to + keep the original changesets, a flag indicating to keep the original branch + name and a flag indicating to detach the source (string, string, string, + boolean, boolean, boolean, boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_bookmark1Button_toggled" ID="HgRebaseDialog.on_bookmark1Button_toggled"></a> +<h4>HgRebaseDialog.on_bookmark1Button_toggled</h4> +<b>on_bookmark1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_bookmark1Combo_editTextChanged" ID="HgRebaseDialog.on_bookmark1Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_bookmark1Combo_editTextChanged</h4> +<b>on_bookmark1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_bookmark2Button_toggled" ID="HgRebaseDialog.on_bookmark2Button_toggled"></a> +<h4>HgRebaseDialog.on_bookmark2Button_toggled</h4> +<b>on_bookmark2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_bookmark2Combo_editTextChanged" ID="HgRebaseDialog.on_bookmark2Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_bookmark2Combo_editTextChanged</h4> +<b>on_bookmark2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_branch1Button_toggled" ID="HgRebaseDialog.on_branch1Button_toggled"></a> +<h4>HgRebaseDialog.on_branch1Button_toggled</h4> +<b>on_branch1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_branch1Combo_editTextChanged" ID="HgRebaseDialog.on_branch1Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_branch1Combo_editTextChanged</h4> +<b>on_branch1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_branch2Button_toggled" ID="HgRebaseDialog.on_branch2Button_toggled"></a> +<h4>HgRebaseDialog.on_branch2Button_toggled</h4> +<b>on_branch2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_branch2Combo_editTextChanged" ID="HgRebaseDialog.on_branch2Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_branch2Combo_editTextChanged</h4> +<b>on_branch2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_id1Button_toggled" ID="HgRebaseDialog.on_id1Button_toggled"></a> +<h4>HgRebaseDialog.on_id1Button_toggled</h4> +<b>on_id1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_id1Edit_textChanged" ID="HgRebaseDialog.on_id1Edit_textChanged"></a> +<h4>HgRebaseDialog.on_id1Edit_textChanged</h4> +<b>on_id1Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID1 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_id2Button_toggled" ID="HgRebaseDialog.on_id2Button_toggled"></a> +<h4>HgRebaseDialog.on_id2Button_toggled</h4> +<b>on_id2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the ID2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_id2Edit_textChanged" ID="HgRebaseDialog.on_id2Edit_textChanged"></a> +<h4>HgRebaseDialog.on_id2Edit_textChanged</h4> +<b>on_id2Edit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the ID2 edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_tag1Button_toggled" ID="HgRebaseDialog.on_tag1Button_toggled"></a> +<h4>HgRebaseDialog.on_tag1Button_toggled</h4> +<b>on_tag1Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag1 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_tag1Combo_editTextChanged" ID="HgRebaseDialog.on_tag1Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_tag1Combo_editTextChanged</h4> +<b>on_tag1Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag1 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgRebaseDialog.on_tag2Button_toggled" ID="HgRebaseDialog.on_tag2Button_toggled"></a> +<h4>HgRebaseDialog.on_tag2Button_toggled</h4> +<b>on_tag2Button_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag2 select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgRebaseDialog.on_tag2Combo_editTextChanged" ID="HgRebaseDialog.on_tag2Combo_editTextChanged"></a> +<h4>HgRebaseDialog.on_tag2Combo_editTextChanged</h4> +<b>on_tag2Combo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag2 combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</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/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper</h1> +<p> +Module implementing the rebase extension project helper. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#RebaseProjectHelper">RebaseProjectHelper</a></td> +<td>Class implementing the rebase extension project helper.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="RebaseProjectHelper" ID="RebaseProjectHelper"></a> +<h2>RebaseProjectHelper</h2> +<p> + Class implementing the rebase extension project helper. +</p> +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#RebaseProjectHelper.__init__">RebaseProjectHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.__hgRebase">__hgRebase</a></td> +<td>Private slot used to rebase changesets to another branch.</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.__hgRebaseAbort">__hgRebaseAbort</a></td> +<td>Private slot used to abort the last rebase session.</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.__hgRebaseContinue">__hgRebaseContinue</a></td> +<td>Private slot used to continue the last rebase session after repair.</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr><tr> +<td><a href="#RebaseProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> +<a NAME="RebaseProjectHelper.__init__" ID="RebaseProjectHelper.__init__"></a> +<h4>RebaseProjectHelper (Constructor)</h4> +<b>RebaseProjectHelper</b>(<i></i>) +<p> + Constructor +</p><a NAME="RebaseProjectHelper.__hgRebase" ID="RebaseProjectHelper.__hgRebase"></a> +<h4>RebaseProjectHelper.__hgRebase</h4> +<b>__hgRebase</b>(<i></i>) +<p> + Private slot used to rebase changesets to another branch. +</p><a NAME="RebaseProjectHelper.__hgRebaseAbort" ID="RebaseProjectHelper.__hgRebaseAbort"></a> +<h4>RebaseProjectHelper.__hgRebaseAbort</h4> +<b>__hgRebaseAbort</b>(<i></i>) +<p> + Private slot used to abort the last rebase session. +</p><a NAME="RebaseProjectHelper.__hgRebaseContinue" ID="RebaseProjectHelper.__hgRebaseContinue"></a> +<h4>RebaseProjectHelper.__hgRebaseContinue</h4> +<b>__hgRebaseContinue</b>(<i></i>) +<p> + Private slot used to continue the last rebase session after repair. +</p><a NAME="RebaseProjectHelper.initActions" ID="RebaseProjectHelper.initActions"></a> +<h4>RebaseProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p><a NAME="RebaseProjectHelper.initMenu" ID="RebaseProjectHelper.initMenu"></a> +<h4>RebaseProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p><dl> +<dt><i>mainMenu</i></dt> +<dd> +reference to the main menu (QMenu) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +populated menu (QMenu) +</dd> +</dl><a NAME="RebaseProjectHelper.menuTitle" ID="RebaseProjectHelper.menuTitle"></a> +<h4>RebaseProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p><dl> +<dt>Returns:</dt> +<dd> +title of the menu (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase</h1> +<p> +Module implementing the rebase extension interface. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Rebase">Rebase</a></td> +<td>Class implementing the rebase extension interface.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="Rebase" ID="Rebase"></a> +<h2>Rebase</h2> +<p> + Class implementing the rebase extension interface. +</p> +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Rebase.__init__">Rebase</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#Rebase.hgRebase">hgRebase</a></td> +<td>Public method to rebase changesets to a different branch.</td> +</tr><tr> +<td><a href="#Rebase.hgRebaseAbort">hgRebaseAbort</a></td> +<td>Public method to abort rebasing changesets from another branch.</td> +</tr><tr> +<td><a href="#Rebase.hgRebaseContinue">hgRebaseContinue</a></td> +<td>Public method to continue rebasing changesets from another branch.</td> +</tr> +</table> +<a NAME="Rebase.__init__" ID="Rebase.__init__"></a> +<h4>Rebase (Constructor)</h4> +<b>Rebase</b>(<i>vcs</i>) +<p> + Constructor +</p><dl> +<dt><i>vcs</i></dt> +<dd> +reference to the Mercurial vcs object +</dd> +</dl><a NAME="Rebase.hgRebase" ID="Rebase.hgRebase"></a> +<h4>Rebase.hgRebase</h4> +<b>hgRebase</b>(<i>path</i>) +<p> + Public method to rebase changesets to a different branch. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Rebase.hgRebaseAbort" ID="Rebase.hgRebaseAbort"></a> +<h4>Rebase.hgRebaseAbort</h4> +<b>hgRebaseAbort</b>(<i>path</i>) +<p> + Public method to abort rebasing changesets from another branch. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Rebase.hgRebaseContinue" ID="Rebase.hgRebaseContinue"></a> +<h4>Rebase.hgRebaseContinue</h4> +<b>hgRebaseContinue</b>(<i>path</i>) +<p> + Public method to continue rebasing changesets from another branch. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html Tue May 31 16:15:55 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html Tue May 31 16:35:45 2011 +0200 @@ -61,7 +61,7 @@ <td>Public method to transplant changesets from another branch.</td> </tr><tr> <td><a href="#Transplant.hgTransplantContinue">hgTransplantContinue</a></td> -<td>Public method to transplant changesets from another branch.</td> +<td>Public method to continue transplanting changesets from another branch.</td> </tr> </table> <a NAME="Transplant.__init__" ID="Transplant.__init__"></a> @@ -93,7 +93,7 @@ <h4>Transplant.hgTransplantContinue</h4> <b>hgTransplantContinue</b>(<i>path</i>) <p> - Public method to transplant changesets from another branch. + Public method to continue transplanting changesets from another branch. </p><dl> <dt><i>path</i></dt> <dd>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension</h1> +<p> +Package implementing the rebase extension support interface. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html">HgRebaseDialog</a></td> +<td>Module implementing a dialog to enter the data for a rebase session.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the rebase extension project helper.</td> +</tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html">rebase</a></td> +<td>Module implementing the rebase extension interface.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Tue May 31 16:15:55 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Tue May 31 16:35:45 2011 +0200 @@ -49,6 +49,9 @@ <td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html">QueuesExtension</a></td> <td>Package implementing the queues extension support interface.</td> </tr><tr> +<td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html">RebaseExtension</a></td> +<td>Package implementing the rebase extension support interface.</td> +</tr><tr> <td><a href="index-eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html">TransplantExtension</a></td> <td>Package implementing the transplant extension support interface.</td> </tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue May 31 16:15:55 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue May 31 16:35:45 2011 +0200 @@ -106,8 +106,10 @@ self.intercept = False self.__hasAddOrDelete = False - if args[0] in ["update", "fetch", "qpush", "qpop", "qgoto", "transplant"] or \ - (args[0] == "pull" and "--update" in args[1:]): + if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", + "update"] or \ + (args[0] == "pull" and \ + ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True else: self.__updateCommand = False
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue May 31 16:15:55 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue May 31 16:35:45 2011 +0200 @@ -22,6 +22,7 @@ from .PurgeExtension.ProjectHelper import PurgeProjectHelper from .GpgExtension.ProjectHelper import GpgProjectHelper from .TransplantExtension.ProjectHelper import TransplantProjectHelper +from .RebaseExtension.ProjectHelper import RebaseProjectHelper from E5Gui.E5Action import E5Action @@ -52,6 +53,7 @@ "purge": PurgeProjectHelper(), "gpg": GpgProjectHelper(), "transplant": TransplantProjectHelper(), + "rebase": RebaseProjectHelper(), } self.__extensionMenuTitles = {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,290 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a rebase session. +""" + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgRebaseDialog import Ui_HgRebaseDialog + + +class HgRebaseDialog(QDialog, Ui_HgRebaseDialog): + """ + Class implementing a dialog to enter the data for a rebase session. + """ + def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param bookmarksList list of bookmarks (list of strings) + @param parent reference to the parent widget (QWidget) + """ + QDialog.__init__(self, parent) + self.setupUi(self) + + self.tag1Combo.addItems(sorted(tagsList)) + self.tag2Combo.addItems(sorted(tagsList)) + self.branch1Combo.addItems(["default"] + sorted(branchesList)) + self.branch2Combo.addItems(["default"] + sorted(branchesList)) + if bookmarksList is not None: + self.bookmark1Combo.addItems(sorted(bookmarksList)) + self.bookmark2Combo.addItems(sorted(bookmarksList)) + else: + self.bookmark1Button.setHidden(True) + self.bookmark1Combo.setHidden(True) + self.bookmark2Button.setHidden(True) + self.bookmark2Combo.setHidden(True) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if not self.parentButton.isChecked(): + if self.id1Button.isChecked(): + enabled = enabled and self.id1Edit.text() != "" + elif self.tag1Button.isChecked(): + enabled = enabled and self.tag1Combo.currentText() != "" + elif self.branch1Button.isChecked(): + enabled = enabled and self.branch1Combo.currentText() != "" + elif self.bookmark1Button.isChecked(): + enabled = enabled and self.bookmark1Combo.currentText() != "" + + if self.id2Button.isChecked(): + enabled = enabled and self.id2Edit.text() != "" + elif self.tag2Button.isChecked(): + enabled = enabled and self.tag2Combo.currentText() != "" + elif self.branch2Button.isChecked(): + enabled = enabled and self.branch2Combo.currentText() != "" + elif self.bookmark2Button.isChecked(): + enabled = enabled and self.bookmark2Combo.currentText() != "" + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_id1Button_toggled(self, checked): + """ + Private slot to handle changes of the ID1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_id2Button_toggled(self, checked): + """ + Private slot to handle changes of the ID2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tag1Button_toggled(self, checked): + """ + Private slot to handle changes of the Tag1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tag2Button_toggled(self, checked): + """ + Private slot to handle changes of the Tag2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branch1Button_toggled(self, checked): + """ + Private slot to handle changes of the Branch1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branch2Button_toggled(self, checked): + """ + Private slot to handle changes of the Branch2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_bookmark1Button_toggled(self, checked): + """ + Private slot to handle changes of the Bookmark1 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_bookmark2Button_toggled(self, checked): + """ + Private slot to handle changes of the Bookmark2 select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + + @pyqtSlot(str) + def on_id1Edit_textChanged(self, txt): + """ + Private slot to handle changes of the ID1 edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_id2Edit_textChanged(self, txt): + """ + Private slot to handle changes of the ID2 edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tag1Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag1 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tag2Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag2 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branch1Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch1 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branch2Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch2 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_bookmark1Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Bookmark1 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_bookmark2Combo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Bookmark2 combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + def __getRevision(self, no): + """ + Private method to generate the revision. + + @param no revision number to generate (1 or 2) + @return revision (string) + """ + if no == 1: + numberButton = self.number1Button + numberSpinBox = self.number1SpinBox + idButton = self.id1Button + idEdit = self.id1Edit + tagButton = self.tag1Button + tagCombo = self.tag1Combo + branchButton = self.branch1Button + branchCombo = self.branch1Combo + bookmarkButton = self.bookmark1Button + bookmarkCombo = self.bookmark1Combo + tipButton = None + else: + numberButton = self.number2Button + numberSpinBox = self.number2SpinBox + idButton = self.id2Button + idEdit = self.id2Edit + tagButton = self.tag2Button + tagCombo = self.tag2Combo + branchButton = self.branch2Button + branchCombo = self.branch2Combo + bookmarkButton = self.bookmark2Button + bookmarkCombo = self.bookmark2Combo + tipButton = self.tip2Button + + if numberButton.isChecked(): + return str(numberSpinBox.value()) + elif idButton.isChecked(): + return idEdit.text() + elif tagButton.isChecked(): + return tagCombo.currentText() + elif branchButton.isChecked(): + return branchCombo.currentText() + elif bookmarkButton.isChecked(): + return bookmarkCombo.currentText() + elif tipButton and tipButton.isChecked(): + return "" + + def getData(self): + """ + Private method to retrieve the data for the rebase session. + + @return tuple with a source indicator of "S" or "B", the source revision, the + destination revision, a flag indicating to collapse, a flag indicating to + keep the original changesets, a flag indicating to keep the original branch + name and a flag indicating to detach the source (string, string, string, + boolean, boolean, boolean, boolean) + """ + if self.sourceButton.isChecked(): + indicator = "S" + elif self.baseButton.isChecked(): + indicator = "B" + else: + indicator = "" + if indicator: + rev1 = self.__getRevision(1) + else: + rev1 = "" + + return ( + indicator, + rev1, + self.__getRevision(2), + self.collapseCheckBox.isChecked(), + self.keepChangesetsCheckBox.isChecked(), + self.keepBranchCheckBox.isChecked(), + self.detachCheckBox.isChecked() + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,683 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgRebaseDialog</class> + <widget class="QDialog" name="HgRebaseDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>650</width> + <height>337</height> + </rect> + </property> + <property name="windowTitle"> + <string>Rebase Changesets</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0" rowspan="4"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Source / Base Revision</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="parentButton"> + <property name="toolTip"> + <string>Select to use the parent of the working directory as the base</string> + </property> + <property name="text"> + <string>Use &Parent as Base</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="sourceButton"> + <property name="toolTip"> + <string>Select to use a revision as the source</string> + </property> + <property name="text"> + <string>&Source Revision</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="baseButton"> + <property name="toolTip"> + <string>Select to use a revision as the base</string> + </property> + <property name="text"> + <string>&Base Revision</string> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="rev1GroupBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="title"> + <string>&Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="number1Button"> + <property name="toolTip"> + <string>Select to specify a revision by number</string> + </property> + <property name="text"> + <string>Number</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="number1SpinBox"> + <property name="toolTip"> + <string>Enter a revision number</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="id1Button"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Id:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="id1Edit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a changeset id</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="tag1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="tag1Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="branch1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="branch1Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QRadioButton" name="bookmark1Button"> + <property name="toolTip"> + <string>Select to specify a revision by a bookmark</string> + </property> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QComboBox" name="bookmark1Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a bookmark name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item row="0" column="1"> + <widget class="QGroupBox" name="rev2GroupBox"> + <property name="title"> + <string>&Destination Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QRadioButton" name="number2Button"> + <property name="toolTip"> + <string>Select to specify a revision by number</string> + </property> + <property name="text"> + <string>Number</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="number2SpinBox"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a revision number</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999999</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="id2Button"> + <property name="toolTip"> + <string>Select to specify a revision by changeset id</string> + </property> + <property name="text"> + <string>Id:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="id2Edit"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a changeset id</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="tag2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2"> + <widget class="QComboBox" name="tag2Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="branch2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QComboBox" name="branch2Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QRadioButton" name="bookmark2Button"> + <property name="toolTip"> + <string>Select to specify a revision by a bookmark</string> + </property> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2"> + <widget class="QComboBox" name="bookmark2Combo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a bookmark name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="0" colspan="3"> + <widget class="QRadioButton" name="tip2Button"> + <property name="toolTip"> + <string>Select tip revision of repository</string> + </property> + <property name="text"> + <string>TIP</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="collapseCheckBox"> + <property name="toolTip"> + <string>Select to collapse the rebased changesets</string> + </property> + <property name="text"> + <string>Collapse Changesets</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="keepChangesetsCheckBox"> + <property name="toolTip"> + <string>Select to keep the original changesets</string> + </property> + <property name="text"> + <string>Keep Original Changesets</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QCheckBox" name="keepBranchCheckBox"> + <property name="toolTip"> + <string>Select to keep the original branch names</string> + </property> + <property name="text"> + <string>Keep Original Branch Name</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>13</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="1"> + <widget class="QCheckBox" name="detachCheckBox"> + <property name="toolTip"> + <string>Select to detach the source from its original branch</string> + </property> + <property name="text"> + <string>Detach Source</string> + </property> + </widget> + </item> + </layout> + </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> + <layoutdefault spacing="6" margin="6"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <tabstops> + <tabstop>parentButton</tabstop> + <tabstop>sourceButton</tabstop> + <tabstop>baseButton</tabstop> + <tabstop>number1Button</tabstop> + <tabstop>number1SpinBox</tabstop> + <tabstop>id1Button</tabstop> + <tabstop>id1Edit</tabstop> + <tabstop>tag1Button</tabstop> + <tabstop>tag1Combo</tabstop> + <tabstop>branch1Button</tabstop> + <tabstop>branch1Combo</tabstop> + <tabstop>bookmark1Button</tabstop> + <tabstop>bookmark1Combo</tabstop> + <tabstop>number2Button</tabstop> + <tabstop>number2SpinBox</tabstop> + <tabstop>id2Button</tabstop> + <tabstop>id2Edit</tabstop> + <tabstop>tag2Button</tabstop> + <tabstop>tag2Combo</tabstop> + <tabstop>branch2Button</tabstop> + <tabstop>branch2Combo</tabstop> + <tabstop>bookmark2Button</tabstop> + <tabstop>bookmark2Combo</tabstop> + <tabstop>tip2Button</tabstop> + <tabstop>collapseCheckBox</tabstop> + <tabstop>keepChangesetsCheckBox</tabstop> + <tabstop>keepBranchCheckBox</tabstop> + <tabstop>detachCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgRebaseDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>124</x> + <y>864</y> + </hint> + <hint type="destinationlabel"> + <x>21</x> + <y>143</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgRebaseDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>176</x> + <y>864</y> + </hint> + <hint type="destinationlabel"> + <x>73</x> + <y>140</y> + </hint> + </hints> + </connection> + <connection> + <sender>number1Button</sender> + <signal>toggled(bool)</signal> + <receiver>number1SpinBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>86</x> + <y>163</y> + </hint> + <hint type="destinationlabel"> + <x>201</x> + <y>164</y> + </hint> + </hints> + </connection> + <connection> + <sender>number2Button</sender> + <signal>toggled(bool)</signal> + <receiver>number2SpinBox</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>99</x> + <y>699</y> + </hint> + <hint type="destinationlabel"> + <x>204</x> + <y>700</y> + </hint> + </hints> + </connection> + <connection> + <sender>id1Button</sender> + <signal>toggled(bool)</signal> + <receiver>id1Edit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>56</x> + <y>189</y> + </hint> + <hint type="destinationlabel"> + <x>245</x> + <y>190</y> + </hint> + </hints> + </connection> + <connection> + <sender>id2Button</sender> + <signal>toggled(bool)</signal> + <receiver>id2Edit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>95</x> + <y>725</y> + </hint> + <hint type="destinationlabel"> + <x>248</x> + <y>726</y> + </hint> + </hints> + </connection> + <connection> + <sender>tag1Button</sender> + <signal>toggled(bool)</signal> + <receiver>tag1Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>83</x> + <y>215</y> + </hint> + <hint type="destinationlabel"> + <x>241</x> + <y>216</y> + </hint> + </hints> + </connection> + <connection> + <sender>branch1Button</sender> + <signal>toggled(bool)</signal> + <receiver>branch1Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>74</x> + <y>241</y> + </hint> + <hint type="destinationlabel"> + <x>229</x> + <y>242</y> + </hint> + </hints> + </connection> + <connection> + <sender>tag2Button</sender> + <signal>toggled(bool)</signal> + <receiver>tag2Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>63</x> + <y>751</y> + </hint> + <hint type="destinationlabel"> + <x>248</x> + <y>752</y> + </hint> + </hints> + </connection> + <connection> + <sender>branch2Button</sender> + <signal>toggled(bool)</signal> + <receiver>branch2Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>100</x> + <y>777</y> + </hint> + <hint type="destinationlabel"> + <x>248</x> + <y>778</y> + </hint> + </hints> + </connection> + <connection> + <sender>bookmark1Button</sender> + <signal>toggled(bool)</signal> + <receiver>bookmark1Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>48</x> + <y>267</y> + </hint> + <hint type="destinationlabel"> + <x>245</x> + <y>268</y> + </hint> + </hints> + </connection> + <connection> + <sender>bookmark2Button</sender> + <signal>toggled(bool)</signal> + <receiver>bookmark2Combo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>48</x> + <y>803</y> + </hint> + <hint type="destinationlabel"> + <x>248</x> + <y>804</y> + </hint> + </hints> + </connection> + <connection> + <sender>parentButton</sender> + <signal>toggled(bool)</signal> + <receiver>rev1GroupBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>139</x> + <y>49</y> + </hint> + <hint type="destinationlabel"> + <x>226</x> + <y>126</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,140 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the rebase extension project helper. +""" + +from PyQt4.QtGui import QMenu + +from E5Gui.E5Action import E5Action +from E5Gui import E5MessageBox + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + +import UI.PixmapCache + + +class RebaseProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the rebase extension project helper. + """ + def __init__(self): + """ + Constructor + """ + super().__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgRebaseAct = E5Action(self.trUtf8('Rebase Changesets'), + UI.PixmapCache.getIcon("vcsRebase.png"), + self.trUtf8('Rebase Changesets'), + 0, 0, self, 'mercurial_rebase') + self.hgRebaseAct.setStatusTip(self.trUtf8( + 'Rebase changesets to another branch' + )) + self.hgRebaseAct.setWhatsThis(self.trUtf8( + """<b>Rebase Changesets</b>""" + """<p>This rebases changesets to another branch.</p>""" + )) + self.hgRebaseAct.triggered[()].connect(self.__hgRebase) + self.actions.append(self.hgRebaseAct) + + self.hgRebaseContinueAct = E5Action( + self.trUtf8('Continue Rebase Session'), + self.trUtf8('Continue Rebase Session'), + 0, 0, self, 'mercurial_rebase_continue') + self.hgRebaseContinueAct.setStatusTip(self.trUtf8( + 'Continue the last rebase session after repair' + )) + self.hgRebaseContinueAct.setWhatsThis(self.trUtf8( + """<b>Continue Rebase Session</b>""" + """<p>This continues the last rebase session after repair.</p>""" + )) + self.hgRebaseContinueAct.triggered[()].connect(self.__hgRebaseContinue) + self.actions.append(self.hgRebaseContinueAct) + + self.hgRebaseAbortAct = E5Action( + self.trUtf8('Abort Rebase Session'), + self.trUtf8('Abort Rebase Session'), + 0, 0, self, 'mercurial_rebase_abort') + self.hgRebaseAbortAct.setStatusTip(self.trUtf8( + 'Abort the last rebase session' + )) + self.hgRebaseAbortAct.setWhatsThis(self.trUtf8( + """<b>Abort Rebase Session</b>""" + """<p>This aborts the last rebase session.</p>""" + )) + self.hgRebaseAbortAct.triggered[()].connect(self.__hgRebaseAbort) + self.actions.append(self.hgRebaseAbortAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu (QMenu) + @return populated menu (QMenu) + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgRebaseAct) + menu.addAction(self.hgRebaseContinueAct) + menu.addAction(self.hgRebaseAbortAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu (string) + """ + return self.trUtf8("Rebase") + + def __hgRebase(self): + """ + Private slot used to rebase changesets to another branch. + """ + shouldReopen = self.vcs.getExtensionObject("rebase")\ + .hgRebase(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Rebase Changesets"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgRebaseContinue(self): + """ + Private slot used to continue the last rebase session after repair. + """ + shouldReopen = self.vcs.getExtensionObject("rebase")\ + .hgRebaseContinue(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Rebase Changesets (Continue)"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgRebaseAbort(self): + """ + Private slot used to abort the last rebase session. + """ + shouldReopen = self.vcs.getExtensionObject("rebase")\ + .hgRebaseAbort(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Rebase Changesets (Abort)"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/__init__.py Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the rebase extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Tue May 31 16:35:45 2011 +0200 @@ -0,0 +1,140 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the rebase extension interface. +""" + +import os + +from PyQt4.QtGui import QDialog + +from ..HgExtension import HgExtension +from ..HgDialog import HgDialog + +from .HgRebaseDialog import HgRebaseDialog + + +class Rebase(HgExtension): + """ + Class implementing the rebase extension interface. + """ + def __init__(self, vcs): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + """ + super().__init__(vcs) + + def hgRebase(self, path): + """ + Public method to rebase changesets to a different branch. + + @param path directory name of the project (string) + @return flag indicating that the project should be reread (boolean) + """ + # find the root of the repo + repodir = self.vcs.splitPath(path)[0] + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return False + + res = False + if self.vcs.isExtensionActive("bookmarks"): + bookmarksList = \ + self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + else: + bookmarksList = None + dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), + self.vcs.hgGetBranchesList(repodir), + bookmarksList) + if dlg.exec_() == QDialog.Accepted: + indicator, sourceRev, destRev, collapse, keep, keepBranches, detach = \ + dlg.getData() + + args = [] + args.append("rebase") + if indicator == "S": + args.append("--source") + args.append(sourceRev) + elif indicator == "B": + args.append("--base") + args.append(sourceRev) + if destRev: + args.append("--dest") + args.append(destRev) + if collapse: + args.append("--collapse") + if keep: + args.append("--keep") + if keepBranches: + args.append("--keepbranches") + if detach: + args.append("--detach") + args.append("--verbose") + + dia = HgDialog(self.trUtf8('Rebase Changesets')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgRebaseContinue(self, path): + """ + Public method to continue rebasing changesets from another branch. + + @param path directory name of the project (string) + @return flag indicating that the project should be reread (boolean) + """ + # find the root of the repo + repodir = self.vcs.splitPath(path)[0] + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return False + + args = [] + args.append("rebase") + args.append("--continue") + args.append("--verbose") + + dia = HgDialog(self.trUtf8('Rebase Changesets (Continue)')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgRebaseAbort(self, path): + """ + Public method to abort rebasing changesets from another branch. + + @param path directory name of the project (string) + @return flag indicating that the project should be reread (boolean) + """ + # find the root of the repo + repodir = self.vcs.splitPath(path)[0] + while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return False + + args = [] + args.append("rebase") + args.append("--abort") + args.append("--verbose") + + dia = HgDialog(self.trUtf8('Rebase Changesets (Abort)')) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Tue May 31 16:15:55 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Tue May 31 16:35:45 2011 +0200 @@ -96,7 +96,7 @@ args.append("--continue") args.append("--verbose") - dia = HgDialog(self.trUtf8('Transplant Changesets (Continue')) + dia = HgDialog(self.trUtf8('Transplant Changesets (Continue)')) res = dia.startProcess(args, repodir) if res: dia.exec_()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue May 31 16:15:55 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue May 31 16:35:45 2011 +0200 @@ -52,6 +52,7 @@ from .PurgeExtension.purge import Purge from .GpgExtension.gpg import Gpg from .TransplantExtension.transplant import Transplant +from .RebaseExtension.rebase import Rebase from .ProjectBrowserHelper import HgProjectBrowserHelper @@ -149,6 +150,7 @@ "purge": Purge(self), "gpg": Gpg(self), "transplant": Transplant(self), + "rebase": Rebase(self), } def getPlugin(self):
--- a/changelog Tue May 31 16:15:55 2011 +0200 +++ b/changelog Tue May 31 16:35:45 2011 +0200 @@ -8,6 +8,7 @@ - added support for the Mercurial purge extension - added support for the Mercurial gpg extension - added support for the Mercurial transplant extension +- added support for the Mercurial rebase extension - enhanced the Mercurial log browser dialog - added function to test the login data to the Email config page
--- a/eric5.e4p Tue May 31 16:15:55 2011 +0200 +++ b/eric5.e4p Tue May 31 16:35:45 2011 +0200 @@ -915,6 +915,10 @@ <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgExtension.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/__init__.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1173,6 +1177,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_cs.ts Tue May 31 16:35:45 2011 +0200 @@ -1380,62 +1380,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -1663,167 +1663,167 @@ <context> <name>BookmarksProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="33"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="33"/> + <source>List bookmarks...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="37"/> + <source>List bookmarks of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="40"/> + <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/BookmarksExtension/ProjectHelper.py" line="47"/> + <source>Define bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="47"/> + <source>Define bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="51"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> - <source>List bookmarks...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="58"/> - <source>List bookmarks of the project</source> + <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/BookmarksExtension/ProjectHelper.py" line="61"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <source>Delete bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="61"/> + <source>Delete bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="65"/> + <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> - <source>Define bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> - <source>Define bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="72"/> - <source>Define a bookmark for the project</source> + <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/BookmarksExtension/ProjectHelper.py" line="75"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <source>Rename bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="75"/> + <source>Rename bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="79"/> + <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> - <source>Delete bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> - <source>Delete bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="86"/> - <source>Delete a bookmark of the project</source> + <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/BookmarksExtension/ProjectHelper.py" line="89"/> - <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/BookmarksExtension/ProjectHelper.py" line="96"/> - <source>Rename bookmark</source> + <source>Move bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/> + <source>Move bookmark...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="93"/> + <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/> - <source>Rename bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="100"/> - <source>Rename a bookmark of the project</source> + <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/BookmarksExtension/ProjectHelper.py" line="103"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <source>Show incoming bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="107"/> + <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> - <source>Move bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> - <source>Move bookmark...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="114"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="117"/> - <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/BookmarksExtension/ProjectHelper.py" line="124"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="128"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="131"/> <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/BookmarksExtension/ProjectHelper.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="118"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="122"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="125"/> <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/BookmarksExtension/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="133"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="137"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="140"/> <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/BookmarksExtension/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="148"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="152"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="155"/> <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/BookmarksExtension/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -11657,7 +11657,7 @@ <translation type="obsolete">Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="68"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="60"/> <source>Fetching from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -11665,27 +11665,27 @@ <context> <name>FetchProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="34"/> <source>Fetch changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="38"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="41"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> <source>Fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -12479,12 +12479,12 @@ <context> <name>Gpg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="87"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="133"/> <source>Sign Revision</source> <translation type="unfinished"></translation> </message> @@ -12492,57 +12492,57 @@ <context> <name>GpgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="54"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="33"/> <source>List Signed Changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="33"/> + <source>List Signed Changesets...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="37"/> + <source>List signed changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="40"/> + <source><b>List Signed Changesets</b><p>This opens a dialog listing all signed changesets.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="47"/> + <source>Verify Signatures</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="51"/> + <source>Verify all signatures there may be for a particular revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="54"/> - <source>List Signed Changesets...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="58"/> - <source>List signed changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="61"/> - <source><b>List Signed Changesets</b><p>This opens a dialog listing all signed changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="68"/> - <source>Verify Signatures</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="72"/> - <source>Verify all signatures there may be for a particular revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="75"/> <source><b>Verify Signatures</b><p>This verifies all signatures there may be for a particular revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="62"/> <source>Sign Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="66"/> <source>Add a signature for a selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="69"/> <source><b>Sign Revision</b><p>This adds a signature for a selected revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> <source>GPG</source> <translation type="unfinished"></translation> </message> @@ -15472,212 +15472,212 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> <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="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <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="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> <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="422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> <translation>Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> <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="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <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="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <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="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> <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="1504"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> <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="1618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> <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="1730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <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="1754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <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="1800"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> <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="1674"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> <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="2117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <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="1899"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15687,37 +15687,37 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> <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="2000"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> <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="1916"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <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="2203"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -16618,12 +16618,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> <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> @@ -17815,587 +17815,587 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/> <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="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="98"/> <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="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> <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="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> <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="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <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="125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/> <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="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <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="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> <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="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <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="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <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="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <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="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <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="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> <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="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <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="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> <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="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="215"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> <translation>Přid&at do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> <translation>Přidat lokální projekt do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>&Remove from repository (and disk)</source> <translation>Odeb&rat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> <source>Remove the local project from the repository (and disk)</source> <translation>Odebrat lokální projekt z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Odebrat z repozitáře</b><p>Lokální projekt se odebere z repozitáře (a z disku).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show limited log</source> <translation>Zobrazit limitovaný log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a limited log of the local project</source> <translation>Zobrazit limitovaný log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> <translation><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <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="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <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="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <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="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> <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="314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <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 &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <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="328"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <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="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> <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="341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <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="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <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="354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> <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="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <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="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <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="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> <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="381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> <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="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> <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="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> <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="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Resolve conflicts</source> <translation>Vyřešit konflikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Resolve con&flicts</source> <translation>Vyřešit kon&flikty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> <source>Resolve all conflicts of the local project</source> <translation>Vyřešit všechny konflikty v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> <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="422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> <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="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <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="442"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <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="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <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="462"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <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="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <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="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <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="510"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> <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="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <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="537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <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="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command options</source> <translation>Parametry příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command &options...</source> <translation>&Parametry příkazu...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Show the Mercurial command options</source> <translation>Zobrazit parametry Mercurial příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <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="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> <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> @@ -18440,437 +18440,437 @@ <translation type="obsolete"><b>Zobrazit kombinovaná nastavení konfigurace</b><p>Toto zobrazí kombinovaná nastavení ze všech konfigurací.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> <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="621"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> <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="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <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="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> <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="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <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="673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <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="722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> <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="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <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="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> <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="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> <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="503"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <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="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> <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="742"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> <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="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <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="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <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="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Skip the current changeset</source> <translation>Přeskočit aktuální množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <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="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup</source> <translation>Identifikovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup...</source> <translation>Identifikovat skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <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="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <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="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> <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="198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <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="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <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="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>Push new branch</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>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="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> <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="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="807"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> <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="895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <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="580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <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="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <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="607"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <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> @@ -19426,6 +19426,184 @@ </message> </context> <context> + <name>HgRebaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="14"/> + <source>Rebase Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="25"/> + <source>Source / Base Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="31"/> + <source>Select to use the parent of the working directory as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="34"/> + <source>Use &Parent as Base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="44"/> + <source>Select to use a revision as the source</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="47"/> + <source>&Source Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="54"/> + <source>Select to use a revision as the base</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="57"/> + <source>&Base Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="67"/> + <source>&Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Vybrat pro zadání revize číslem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">Číslo</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Zadejte číslo revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation type="unfinished">Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <source>&Destination Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation type="unfinished">TIP</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <source>Select to collapse the rebased changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> + <source>Collapse Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> + <source>Select to keep the original changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> + <source>Keep Original Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Select to keep the original branch names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <source>Keep Original Branch Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="418"/> + <source>Select to detach the source from its original branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <source>Detach Source</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -29808,22 +29986,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <source>Purge Files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> - <source>Purge Files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -29831,77 +30009,77 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="54"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="33"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="58"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="37"/> <source>Delete files and directories not known to Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="40"/> <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="51"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="75"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="54"/> <source>Delete files and directories not known to Mercurial including ignored ones</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="78"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="57"/> <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="69"/> <source>List Files to be Purged</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="69"/> + <source>List Files to be Purged...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="73"/> + <source>List files and directories not known to Mercurial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="84"/> + <source>List All Files to be Purged</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="84"/> + <source>List All Files to be Purged...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="87"/> + <source>List files and directories not known to Mercurial including ignored ones</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="76"/> + <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="90"/> - <source>List Files to be Purged...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="94"/> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="105"/> - <source>List All Files to be Purged</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="105"/> - <source>List All Files to be Purged...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="108"/> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="142"/> - <source>Purge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="97"/> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111"/> <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial including ignored ones. These would be deleted by the "Purge All Files" menu entry.</p></source> <translation type="unfinished"></translation> </message> @@ -31859,177 +32037,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="482"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="536"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="536"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="732"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -32037,622 +32215,708 @@ <context> <name>QueuesProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="34"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="34"/> <source>New Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="58"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="37"/> <source>Create a new patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="40"/> <source><b>New Patch</b><p>This creates a new named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="68"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="47"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="50"/> <source>Update the current patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="74"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="53"/> <source><b>Update Current Patch</b><p>This updates the current patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="60"/> <source>Update Current Patch (with Message)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="85"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="64"/> <source>Update the current patch and edit commit message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="88"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="67"/> <source><b>Update Current Patch (with Message)</b><p>This updates the current patch after giving the chance to change the current commit message.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="97"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="76"/> <source>Show Current Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="76"/> + <source>Show Current Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="79"/> + <source>Show the contents the current patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="82"/> + <source><b>Show Current Patch</b><p>This shows the contents of the current patch including any changes which have been made in the working directory since the last refresh.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="91"/> + <source>Show Current Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="91"/> + <source>Show Current Message...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="94"/> + <source>Show the commit message of the current patch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="97"/> - <source>Show Current Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="100"/> - <source>Show the contents the current patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="103"/> - <source><b>Show Current Patch</b><p>This shows the contents of the current patch including any changes which have been made in the working directory since the last refresh.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="112"/> - <source>Show Current Message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="112"/> - <source>Show Current Message...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="115"/> - <source>Show the commit message of the current patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="118"/> <source><b>Show Current Message</b><p>This shows the commit message of the current patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="104"/> <source>List Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="104"/> <source>List Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="107"/> <source>List applied and unapplied patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="117"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="120"/> <source>Finish applied patches</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="123"/> + <source><b>Finish Applied Patches</b><p>This finishes the applied patches by moving them out of mq control into regular repository history.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="131"/> + <source>Rename Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="134"/> + <source>Rename a patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="137"/> + <source><b>Rename Patch</b><p>This renames the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="144"/> - <source><b>Finish Applied Patches</b><p>This finishes the applied patches by moving them out of mq control into regular repository history.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="152"/> - <source>Rename Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="155"/> - <source>Rename a patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="158"/> - <source><b>Rename Patch</b><p>This renames the current or a named patch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="165"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="147"/> <source>Delete unapplied patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="171"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="150"/> <source><b>Delete Patch</b><p>This deletes an unapplied patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="157"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="160"/> <source>Fold unapplied patches into the current patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="163"/> <source><b>Fold Patches</b><p>This folds unapplied patches into the current patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="277"/> <source>Push Next Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="182"/> <source>Push the next patch onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="185"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="291"/> <source>Push All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="195"/> <source>Push all patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="198"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="306"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="208"/> <source>Push patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="321"/> <source>Pop Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="222"/> <source>Pop the current patch off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="225"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="335"/> <source>Pop All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="235"/> <source>Pop all patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="238"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="350"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="269"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="248"/> <source>Pop patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="251"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="364"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="262"/> + <source>Push or pop patches until named patch is at top of stack</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="265"/> + <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="280"/> + <source>Push the next patch onto the stack on top of local changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="283"/> - <source>Push or pop patches until named patch is at top of stack</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="286"/> - <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="301"/> - <source>Push the next patch onto the stack on top of local changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="304"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="294"/> <source>Push all patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="297"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="309"/> <source>Push patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="312"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="324"/> <source>Pop the current patch off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="327"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="338"/> <source>Pop all patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="341"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="353"/> <source>Pop patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="356"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="367"/> <source>Push or pop patches until named patch is at top of stack overwriting any local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="371"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack overwriting any local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="675"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="656"/> <source>Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="578"/> <source>Push/Pop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="611"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="590"/> <source>Push/Pop (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="110"/> <source><b>List Patches</b><p>This lists all applied and unapplied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="232"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="211"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="384"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="384"/> <source>Define Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="387"/> <source>Define guards for the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="390"/> + <source><b>Define Guards</b><p>This opens a dialog to define guards for the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="398"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="398"/> + <source>Drop All Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="401"/> + <source>Drop all guards of the current or a named patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="404"/> + <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="411"/> + <source>List Guards</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="411"/> - <source><b>Define Guards</b><p>This opens a dialog to define guards for the current or a named patch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> - <source>Drop All Guards...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="422"/> - <source>Drop all guards of the current or a named patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="425"/> - <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> - <source>List Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> <source>List Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="414"/> <source>List guards of the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="417"/> <source><b>List Guards</b><p>This lists the guards of the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="424"/> <source>List All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="424"/> <source>List All Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="427"/> <source>List all guards of all patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="451"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="430"/> <source><b>List All Guards</b><p>This lists all guards of all patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="437"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="458"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="437"/> <source>Set Active Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="440"/> <source>Set the list of active guards</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="443"/> + <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="450"/> + <source>Deactivate Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="450"/> + <source>Deactivate Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="453"/> + <source>Deactivate all active guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="456"/> + <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="464"/> - <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="471"/> - <source>Deactivate Guards</source> + <source>Identify Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="464"/> + <source>Identify Active Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="468"/> + <source>Show a list of active guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="471"/> - <source>Deactivate Guards...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="474"/> - <source>Deactivate all active guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="477"/> - <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="485"/> - <source>Identify Active Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="485"/> - <source>Identify Active Guards...</source> + <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="602"/> + <source>Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="483"/> + <source>Create Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="486"/> + <source>Create a new patch queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="489"/> - <source>Show a list of active guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="492"/> - <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="623"/> - <source>Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="504"/> - <source>Create Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="507"/> - <source>Create a new patch queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="510"/> <source><b>Create Queue</b><p>This creates a new patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="497"/> <source>Rename Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="500"/> <source>Rename the active patch queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="503"/> <source><b>Rename Queue</b><p>This renames the active patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="532"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="511"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="514"/> <source>Delete the reference to a patch queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="538"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="517"/> <source><b>Delete Queue</b><p>This deletes the reference to a patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="525"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="528"/> + <source>Delete the reference to a patch queue and remove the patch directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="531"/> + <source><b>Purge Queue</b><p>This deletes the reference to a patch queue and removes the patch directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="540"/> + <source>Activate Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="543"/> + <source>Set the active queue</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="546"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="549"/> - <source>Delete the reference to a patch queue and remove the patch directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="552"/> - <source><b>Purge Queue</b><p>This deletes the reference to a patch queue and removes the patch directory.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="561"/> - <source>Activate Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="564"/> - <source>Set the active queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="567"/> <source><b>Activate Queue</b><p>This sets the active queue.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="575"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="554"/> <source>List Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="575"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="554"/> <source>List Queues...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> <source>List the available queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="581"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="560"/> <source><b>List Queues</b><p>This opens a dialog showing all available queues.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="615"/> <source>Queue Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="712"/> <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/QueuesExtension/ProjectHelper.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="712"/> <source>Changing Applied Patches</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>Rebase</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> + <source>Rebase Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="107"/> + <source>Rebase Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="134"/> + <source>Rebase Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RebaseProjectHelper</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <source>Rebase Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="38"/> + <source>Rebase changesets to another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="41"/> + <source><b>Rebase Changesets</b><p>This rebases changesets to another branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="48"/> + <source>Continue Rebase Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="52"/> + <source>Continue the last rebase session after repair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="55"/> + <source><b>Continue Rebase Session</b><p>This continues the last rebase session after repair.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="62"/> + <source>Abort Rebase Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="66"/> + <source>Abort the last rebase session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="69"/> + <source><b>Abort Rebase Session</b><p>This aborts the last rebase session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <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/RebaseExtension/ProjectHelper.py" line="121"/> + <source>Rebase Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <source>Rebase Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ReplaceWidget</name> <message> <location filename="QScintilla/ReplaceWidget.ui" line="14"/> @@ -41548,13 +41812,13 @@ <context> <name>Transplant</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="79"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="72"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="105"/> - <source>Transplant Changesets (Continue</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="99"/> + <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> </context> @@ -41639,50 +41903,55 @@ <context> <name>TransplantProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="93"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="38"/> <source>Transplant changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="41"/> <source><b>Transplant Changesets</b><p>This transplants changesets from another branch on top of the current working directory with the log of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="67"/> <source>Continue</source> - <translation type="unfinished">Pokračovat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Pokračovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="53"/> <source>Continue the last transplant session after repair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="74"/> - <source><b>Continue</b><p>This continues the last transplant session after repair.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> <source>Transplant</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> <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/TransplantExtension/ProjectHelper.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="49"/> + <source>Continue Transplant Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> + <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>TrayStarter</name> @@ -48563,30 +48832,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <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="1567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> <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="1575"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <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="1111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> <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="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48597,23 +48866,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> <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="1563"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <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="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> <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> @@ -48621,7 +48890,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_de.ts Tue May 31 16:35:45 2011 +0200 @@ -1381,62 +1381,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> <source>Mercurial Bookmark</source> <translation>Mercurial Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <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/BookmarksExtension/bookmarks.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial Lesezeichen löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial Lesezeichen umbenennen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="214"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial Lesezeichen verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> <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/BookmarksExtension/bookmarks.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial Repository hoch</translation> </message> @@ -1665,167 +1665,167 @@ <context> <name>BookmarksProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="33"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="33"/> + <source>List bookmarks...</source> + <translation>Lesezeichen listen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="37"/> + <source>List bookmarks of the project</source> + <translation>Listet Lesezeichen des Projektes</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="40"/> + <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/BookmarksExtension/ProjectHelper.py" line="47"/> + <source>Define bookmark</source> + <translation>Lesezeichen hinzufügen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="47"/> + <source>Define bookmark...</source> + <translation>Lesezeichen hinzufügen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="51"/> + <source>Define a bookmark for the project</source> + <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="54"/> - <source>List bookmarks...</source> - <translation>Lesezeichen listen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="58"/> - <source>List bookmarks of the project</source> - <translation>Listet Lesezeichen des Projektes</translation> + <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/BookmarksExtension/ProjectHelper.py" line="61"/> - <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> + <source>Delete bookmark</source> + <translation>Lesezeichen löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="61"/> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="65"/> + <source>Delete a bookmark of the project</source> + <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> - <source>Define bookmark</source> - <translation>Lesezeichen hinzufügen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="68"/> - <source>Define bookmark...</source> - <translation>Lesezeichen hinzufügen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="72"/> - <source>Define a bookmark for the project</source> - <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> + <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/BookmarksExtension/ProjectHelper.py" line="75"/> - <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> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="75"/> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="79"/> + <source>Rename a bookmark of the project</source> + <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> - <source>Delete bookmark</source> - <translation>Lesezeichen löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="82"/> - <source>Delete bookmark...</source> - <translation>Lesezeichen löschen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="86"/> - <source>Delete a bookmark of the project</source> - <translation>Löscht ein Lesezeichen aus dem Projekt</translation> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/> - <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/BookmarksExtension/ProjectHelper.py" line="96"/> - <source>Rename bookmark</source> - <translation>Lesezeichen umbenennen</translation> + <source>Move bookmark</source> + <translation>Lesezeichen verschieben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="89"/> + <source>Move bookmark...</source> + <translation>Lesezeichen verschieben...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="93"/> + <source>Move a bookmark of the project</source> + <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="96"/> - <source>Rename bookmark...</source> - <translation>Lesezeichen umbenennen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="100"/> - <source>Rename a bookmark of the project</source> - <translation>Benennt ein Lesezeichen des Projektes um</translation> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="103"/> - <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> + <source>Show incoming bookmarks</source> + <translation>Zeige eingehende Lesezeichen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="107"/> + <source>Show a list of incoming bookmarks</source> + <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> - <source>Move bookmark</source> - <translation>Lesezeichen verschieben</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="110"/> - <source>Move bookmark...</source> - <translation>Lesezeichen verschieben...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="114"/> - <source>Move a bookmark of the project</source> - <translation>Verschiebt ein Lesezeichen des Projektes</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="117"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="124"/> - <source>Show incoming bookmarks</source> - <translation>Zeige eingehende Lesezeichen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="128"/> - <source>Show a list of incoming bookmarks</source> - <translation>Zeigt eine Liste eingehender Lesezeichen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="131"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="118"/> <source>Pull bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="122"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="125"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="133"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="137"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="140"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="148"/> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="152"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="155"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="194"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> @@ -11478,7 +11478,7 @@ <context> <name>Fetch</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="68"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="60"/> <source>Fetching from a remote Mercurial repository</source> <translation>Fetch von einem entfernten Mercurial Repository</translation> </message> @@ -11486,27 +11486,27 @@ <context> <name>FetchProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="34"/> <source>Fetch changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="59"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="38"/> <source>Fetch changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen und einarbeiten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="41"/> <source><b>Fetch changes</b><p>This pulls changes from a remote repository into the local repository. If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p></source> <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter. Wenn die heruntergeladenen Änderungen einen neuen Kopf erzeugen, so werden die Köpfe automatisch zusammengeführt und das Ergebnis eingepflegt. Abschließend wird das Arbeitsverzeichnis mit den neuen Änderungen aktualisiert.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> <source>Fetch</source> <translation>Fetch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="81"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -12301,12 +12301,12 @@ <context> <name>Gpg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="89"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="87"/> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="133"/> <source>Sign Revision</source> <translation>Revision signieren</translation> </message> @@ -12314,57 +12314,57 @@ <context> <name>GpgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="54"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="33"/> <source>List Signed Changesets</source> <translation>Signierte Änderungssätze auflisten</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="33"/> + <source>List Signed Changesets...</source> + <translation>Signierte Änderungssätze auflisten...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="37"/> + <source>List signed changesets</source> + <translation>Signierte Änderungssätze auflisten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="40"/> + <source><b>List Signed Changesets</b><p>This opens a dialog listing all signed changesets.</p></source> + <translation><b>Signierte Änderungssätze auflisten</b><p>Dies öffnet einen Dialog, der alle signierten Änderungssätze anzeigt.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="47"/> + <source>Verify Signatures</source> + <translation>Signaturen verifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="51"/> + <source>Verify all signatures there may be for a particular revision</source> + <translation>Alle Signaturen einer ausgewählten Revision verifizieren</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="54"/> - <source>List Signed Changesets...</source> - <translation>Signierte Änderungssätze auflisten...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="58"/> - <source>List signed changesets</source> - <translation>Signierte Änderungssätze auflisten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="61"/> - <source><b>List Signed Changesets</b><p>This opens a dialog listing all signed changesets.</p></source> - <translation><b>Signierte Änderungssätze auflisten</b><p>Dies öffnet einen Dialog, der alle signierten Änderungssätze anzeigt.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="68"/> - <source>Verify Signatures</source> - <translation>Signaturen verifizieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="72"/> - <source>Verify all signatures there may be for a particular revision</source> - <translation>Alle Signaturen einer ausgewählten Revision verifizieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="75"/> <source><b>Verify Signatures</b><p>This verifies all signatures there may be for a particular revision.</p></source> <translation><b>Signaturen verifizieren</b><p>Dies verifiziert alle Signaturen einer ausgewählten Revision.</p<</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="62"/> <source>Sign Revision</source> <translation>Revision signieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="87"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="66"/> <source>Add a signature for a selected revision</source> <translation>Einer ausgewählten Revision eine Signatur hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="69"/> <source><b>Sign Revision</b><p>This adds a signature for a selected revision.</p></source> <translation><b>Revision signieren</b><p>Dies fügt einer ausgewählten Revision eine Signatur hinzu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py" line="98"/> <source>GPG</source> <translation>GPG</translation> </message> @@ -15211,247 +15211,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> <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="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> <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="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> <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="422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> <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="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <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="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> <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="636"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> <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="1504"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> <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="1618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> <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="1730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1735"/> <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="1754"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1805"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> <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="1674"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2042"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1848"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/> <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="2117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/> <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="1899"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1904"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> <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="2000"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2005"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2158"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1916"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <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="2203"/> + <source>Rollback last transaction</source> + <translation>Letzte Transaktion zurücksetzen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> - <source>Rollback last transaction</source> - <translation>Letzte Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -16361,12 +16361,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> <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> @@ -17562,1022 +17562,1022 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="95"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Erzeuge (clone) ein neues Projekt aus einem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="98"/> <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="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> <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="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> <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="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <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="125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="127"/> <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="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>&Update from repository</source> <translation>&Abgleich mit Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> <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="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> <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="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>Commit changes to repository</source> <translation>Änderungen in Repository einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>&Commit changes to repository...</source> <translation>&Änderungen in Repository einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <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="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <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="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <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="169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <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="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> <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="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <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="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> <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="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="215"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> <translation>Zum Repository &hinzufügen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> <translation>Fügt das lokale Projekt zum Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum Repository hinzu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>&Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) &löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> <source>Remove the local project from the repository (and disk)</source> <translation>Löscht das lokale Projekt von dem Repository (und der Platte)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Vom Repository löschen</b><p>Dies löscht das lokale Projekt vom Repository (und der Platte).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> <source>Show &log</source> <translation>&Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> <source>Show the log of the local project</source> <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show limited log</source> <translation>Beschreibungen limitiert anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a limited log of the local project</source> <translation>Zeigt eine begrenzte Anzahl an Beschreibungen für das aktuelle Projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> <translation><b>Beschreibungen limitiert anzeigen</b><p>Dies zeigt die Beschreibungen des lokalen Projektes limitiert auf eine auswählbare Anzahl von Einträgen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <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="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <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="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <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="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313"/> <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="314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="316"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <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 &status</source> <translation>Status an&zeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> <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="328"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> <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="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> <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="341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <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="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Show parents</source> <translation>Vorgänger 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 parents of the repository</source> <translation>Zeigt die Vorgänger 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 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="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <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="367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <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="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> <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="381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="383"/> <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="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> <source>Merge changes of a revision into the local project</source> <translation>Pflege Änderungen einer Revision in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen einer Revision in das lokale Projekt ein.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Resolve conflicts</source> <translation>Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Resolve con&flicts</source> <translation>&Konflikte lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> <source>Resolve all conflicts of the local project</source> <translation>Löse alle Konflikte des lokalen Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> <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="422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="424"/> <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="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> <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="442"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <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="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <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="462"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <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="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <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="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <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="510"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="516"/> <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="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="519"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="529"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <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="537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <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="543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> <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="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command options</source> <translation>Befehlsoptionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command &options...</source> <translation>Befehls&optionen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Show the Mercurial command options</source> <translation>Zeigt die Mercurial Befehlsoptionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <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="567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> <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="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> <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 Repositories.</p<</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <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="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649"/> <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="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <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="673"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <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="722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> <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="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <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="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="730"/> <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="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="502"/> <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="503"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <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="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> <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="742"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="744"/> <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="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Mark as "bad"</source> <translation>Als "schlecht" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <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="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <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="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Skip the current changeset</source> <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780"/> <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="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <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="887"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738"/> <source>Mark as "good"...</source> <translation>Als "gut" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup</source> <translation>Änderungsgruppe identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup...</source> <translation>Änderungsgruppe identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="793"/> <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="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <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="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> <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="198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <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="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <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="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <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="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="478"/> <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="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> +
