Mercurial Repositories > eric / changeset
changeset
Added support for the Mercurial rebase extension.
Tue, 31 May 2011 16:35:45 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 31 May 2011 16:35:45 +0200
- changeset 1093
- 47bc4ef30315
- parent 1092
- 1b149c2d9ae1
- child 1094
- 743900906d8e
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"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</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><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="897"/> <source>Extensions</source> <translation>Erweiterungen</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>Nutzerkonfiguration editieren</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>Nutzerkonfiguration editieren...</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>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</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><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</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>Repositorykonfiguration editieren...</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>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</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><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</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>Zeige kombinierte Einstellungen...</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>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</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><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> @@ -19130,6 +19130,184 @@ </message> </context> <context> + <name>HgRebaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="14"/> + <source>Rebase Changesets</source> + <translation>Änderungssätze umgruppieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="25"/> + <source>Source / Base Revision</source> + <translation>Quell- /Basisrevision</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>Auswählen, um den Vorgänger des Arbeitsverzeichnisses als Basis zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="34"/> + <source>Use &Parent as Base</source> + <translation>&Vorgänger als Basis verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="44"/> + <source>Select to use a revision as the source</source> + <translation>Auswählen, um eine Revision als Quelle zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="47"/> + <source>&Source Revision</source> + <translation>&Quellrevision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="54"/> + <source>Select to use a revision as the base</source> + <translation>Auswählen, um eine Revision als Basis zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="57"/> + <source>&Base Revision</source> + <translation>&Basisrevision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="67"/> + <source>&Revision</source> + <translation>&Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="222"/> + <source>Select to specify a revision by number</source> + <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation>Nummer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation>Gib eine Revisionsnummer ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="264"/> + <source>Select to specify a revision by changeset id</source> + <translation>Auswählen, um eine Revision mit ihrer Änderungssatz ID anzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation>Id:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation>Gib die Änderungssatz ID ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="307"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="330"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="333"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="349"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="216"/> + <source>&Destination Revision</source> + <translation>&Zielrevision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="359"/> + <source>Select tip revision of repository</source> + <translation>Wähle neueste Revision des Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation>TIP</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="375"/> + <source>Select to collapse the rebased changesets</source> + <translation>Auswählen, um die umgruppierten Änderungssätze zusammenzufassen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="378"/> + <source>Collapse Changesets</source> + <translation>Änderungssätze zusammenfassen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="385"/> + <source>Select to keep the original changesets</source> + <translation>Auswählen, um die originalen Änderungssätze zu behalten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="388"/> + <source>Keep Original Changesets</source> + <translation>Originale Änderungssätze behalten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <source>Select to keep the original branch names</source> + <translation>Auswählen, um die originalen Zweignamen zu behalten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="398"/> + <source>Keep Original Branch Name</source> + <translation>Originale Zweignamen behalten</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>Auswählen, um die Quelle vom originalen Zweig zu trennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="421"/> + <source>Detach Source</source> + <translation>Quelle trennen</translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -29238,22 +29416,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>Alle Dateien löschen</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>Wollen sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, inklusive ignorierter Dateien löschen?</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <source>Purge Files</source> + <translation>Dateien löschen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> - <source>Purge Files</source> - <translation>Dateien löschen</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>Wollen sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, löschen?</translation> </message> @@ -29261,77 +29439,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>Dateien löschen</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>Dateien und Verzeichnis, die Mercurial unbekannt sind, löschen</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><b>Dateien löschen</b><p>Dies löscht Dateien und Verzeichnis, die Mercurial unbekannt sind. Diese Elemente werden gelöscht:<ul><li>unbekannte Dateien (mit "nicht versioniert" im Statusdialog markiert)</li><li>leere Verzeichnisse</li></ul>Hinweis: Ignorierte Dateien werden nicht berührt.</p></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>Alle Dateien löschen</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>Dateien und Verzeichnis, die Mercurial unbekannt sind, inklusive ignorierter Dateien löschen</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><b>Dateien löschen</b><p>Dies löscht Dateien und Verzeichnis, die Mercurial unbekannt sind. Diese Elemente werden gelöscht:<ul><li>unbekannte Dateien (mit "nicht versioniert" im Statusdialog markiert)</li><li>leere Verzeichnisse</li><li>ignorierte Dateien und Verzeichnisse</li></ul></p></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>Zu löschende Dateien auflisten</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="69"/> + <source>List Files to be Purged...</source> + <translation>Zu löschende Dateien auflisten...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="73"/> + <source>List files and directories not known to Mercurial</source> + <translation>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="84"/> + <source>List All Files to be Purged</source> + <translation>Alle zu löschenden Dateien auflisten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="84"/> + <source>List All Files to be Purged...</source> + <translation>Alle zu löschenden Dateien auflisten...</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>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="123"/> + <source>Purge</source> + <translation>Purge</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><b>Zu löschende Dateien auflisten</b><p>Dies listet Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf. Diese würden über den Menüeintrag "Dateien löschen" gelöscht werden.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="90"/> - <source>List Files to be Purged...</source> - <translation>Zu löschende Dateien auflisten...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="94"/> - <source>List files and directories not known to Mercurial</source> - <translation>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="105"/> - <source>List All Files to be Purged</source> - <translation>Alle zu löschenden Dateien auflisten</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="105"/> - <source>List All Files to be Purged...</source> - <translation>Alle zu löschenden Dateien auflisten...</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>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="142"/> - <source>Purge</source> - <translation>Purge</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><b>Zu löschende Dateien auflisten</b><p>Dies listet Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf. Diese würden über den Menüeintrag "Dateien löschen" gelöscht werden.</p></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><b>Alle zu löschenden Dateien auflisten</b><p>Dies listet Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf. Diese würden über den Menüeintrag "Alle Dateien löschen" gelöscht werden.</p></translation> </message> @@ -31320,177 +31498,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>Neuer Patch</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>Aktuellen Patch aktualisieren</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>Pop Patches</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>Push Patches</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>zu Patch wechseln</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>Patch auswählen</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>Wählen den Namen des Zielpatches aus:</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>Keine Patches zum Auswählen vorhanden.</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>Angewandte Patches abschließen</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>Patch umbenennen</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>Wähle den zu löschenden Patch aus:</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>Patch löschen</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>Patches zusammenfügen</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>Keine Patches ausgewählt.</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>Keine Patches zum Zusammenführen verfügbar.</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>Guards anzeigen</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>Keine Patches verfügbar, für die Guards angezeigt werden können.</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>Guards definieren</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>Keine Patches verfügbar, für die Guards definiert werden können.</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>Alle Guards löschen</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>Patch auswählen dessen Guards gelöscht werden sollen (für aktuellen Patch leer lassen):</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>Aktive Guards setzen</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>Keine Guards zur Auswahl verfügbar.</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>Guards deaktivieren</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>Neue Patchschlange anlegen</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>Aktive Patchschlange umbenennen</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>Fehler beim Anlegen einer neuen Patchschlange.</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>Fehler beim Umbenennen der aktiven Patchschlange.</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>Patchschlange säubern</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>Patchschlange löschen</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>Patchschlange aktivieren</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>Fehler beim Säubern der Patchschlange.</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>Fehler beim Löschen der Patchschlange.</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>Fehler beim Setzen der aktiven Patchschlange.</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>Verfügbare Patchschlangen</translation> </message> @@ -31498,622 +31676,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>Neuer Patch</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>Neuer Patch...</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>Erzeuge einen neuen Patch</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><b>Neuer Patch</b><p>Dies erzeugt einen neuen benannten Patch.</p></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>Aktuellen Patch aktualisieren</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>Aktualisiert den aktuellen Patch</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><b>Aktuellen Patch aktualisieren</b><p>Dies aktualisiert den aktuellen Patch.</p></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>Aktuellen Patch aktualisieren (mit Nachricht)</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>Aktualisiert den aktuellen Patch und bearbeitet die Änderungsbeschreibung</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><b>Aktuellen Patch aktualisieren (mit Nachricht)</b><p>Die aktualisiert den aktuellen Patch und gibt die Möglichkeit, die aktuelle Änderungsbeschreibung zu bearbeiten.</p></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>Aktuellen Patch anzeigen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="76"/> + <source>Show Current Patch...</source> + <translation>Aktuellen Patch anzeigen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="79"/> + <source>Show the contents the current patch</source> + <translation>Zeigt den Inhalt des aktuellen Patches an</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><b>Aktuellen Patch anzeigen</b><p>Dies zeigt den Inhalt des aktuellen Patches inklusive aller Änderungen, die seit der letzten Aktualisierung im Arbeitsverzeichnis vorgenommen wurde, an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="91"/> + <source>Show Current Message</source> + <translation>Aktuelle Nachricht anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="91"/> + <source>Show Current Message...</source> + <translation>Aktuelle Nachricht anzeigen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="94"/> + <source>Show the commit message of the current patch</source> + <translation>Zeigt die Änderungsbeschreibung des aktuellen Patches an</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="97"/> - <source>Show Current Patch...</source> - <translation>Aktuellen Patch anzeigen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="100"/> - <source>Show the contents the current patch</source> - <translation>Zeigt den Inhalt des aktuellen Patches an</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><b>Aktuellen Patch anzeigen</b><p>Dies zeigt den Inhalt des aktuellen Patches inklusive aller Änderungen, die seit der letzten Aktualisierung im Arbeitsverzeichnis vorgenommen wurde, an.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="112"/> - <source>Show Current Message</source> - <translation>Aktuelle Nachricht anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="112"/> - <source>Show Current Message...</source> - <translation>Aktuelle Nachricht anzeigen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="115"/> - <source>Show the commit message of the current patch</source> - <translation>Zeigt die Änderungsbeschreibung des aktuellen Patches an</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><b>Aktuelle Nachricht anzeigen</b><p>Dies zeigt die Änderungsbeschreibung des aktuellen Patches an.</p></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>Patches auflisten</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>Listen der Patches...</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>Listet angewandte und nicht angewandte Patches auf</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>Angwandte Patches abschließen</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>Angewandte Patches abschließen</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><b>Angwandte Patches abschließen</b><p>Dies schließt die angewandten Patches ab und verschiebt sie aus der Kontrolle vom mq in die normale Repositoryhistorie.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="131"/> + <source>Rename Patch</source> + <translation>Patch umbenennen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="134"/> + <source>Rename a patch</source> + <translation>Einen Patch umbenennen</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><b>Patch umbenennen</b><p>Dies nennt den aktuellen oder einen benannten Patch um.</p></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><b>Angwandte Patches abschließen</b><p>Dies schließt die angewandten Patches ab und verschiebt sie aus der Kontrolle vom mq in die normale Repositoryhistorie.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="152"/> - <source>Rename Patch</source> - <translation>Patch umbenennen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="155"/> - <source>Rename a patch</source> - <translation>Einen Patch umbenennen</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><b>Patch umbenennen</b><p>Dies nennt den aktuellen oder einen benannten Patch um.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="165"/> <source>Delete Patch</source> <translation>Patch löschen</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>Nicht angwandten Patch löschen</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><b>Patch löschen</b><p>Dies löscht einen nicht angwandten Patch.</p></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>Patches zusammenfügen</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>Nicht angwandte Patches mit dem aktuellen Patch zusammenführen</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><b>Patches zusammenfügen</b><p>Dies führt nicht angewandte Patches mit dem aktuellen Patch zusammen.</p></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>Nächsten Patch pushen</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>Schiebt den nächsten Patch auf den Stack</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><b>Nächsten Patch pushen</b><p>Dies schiebt den nächsten Patch auf den Stapel angewandter Patches.</p></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>Alle Patches pushen</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>Schiebt alle Patches auf den Stack</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><b>Alle Patches pushen</b><p>Dies schiebt alle Patches auf den Stapel angewandter Patches.</p></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>Patches pushen</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>Schiebt Patches auf den Stack</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>Aktuellen Patch popen</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>Holt den aktuellen Patch vom Stapel</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><b>Aktuellen Patch popen</b><p>Dies holt den aktuellen Patch vom Stapel angewandter Patches.</p></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>Alle Patches popen</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>Holt allen Patches vom Stapel</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><b>Alle Patches popen</b><p>Dies holt alle Patches vom Stapel angewandter Patches.</p></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>Patches popen</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>Holt Patches vom Stapel</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><b>Patches popen</b><p>Dies holt Patches vom Stapel angewandter Patches bis ein benannter Patch zuoberst liegt.</p></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>Zu Patch wechseln</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>Schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt</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><b>Zu Patch wechseln</b><p>Dies schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt.</p></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>Schiebt den nächsten Patch auf den Stack unabhängig von lokalen Änderungen</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>Schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt</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><b>Zu Patch wechseln</b><p>Dies schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt.</p></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>Schiebt den nächsten Patch auf den Stack unabhängig von lokalen Änderungen</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><b>Nächsten Patch pushen</b><p>Dies schiebt den nächsten Patch auf den Stapel angewandter Patches unabhängig von lokalen Änderungen.</p></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>Schiebt alle Patches auf den Stack unabhängig von lokalen Änderungen</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><b>Alle Patches pushen</b><p>Dies schiebt alle Patches auf den Stapel angewandter Patches unabhängig von lokalen Änderungen.</p></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>Schiebt Patches auf den Stack unabhängig von lokalen Änderungen</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><b>Patches pushen</b><p>Dies schiebt alle Patches auf den Stapel angewandter Patches bis ein benannter Patch zuoberst liegt unabhängig von lokalen Änderungen.</p></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>Holt den aktuellen Patch vom Stapel unabhängig von lokalen Änderungen</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><b>Aktuellen Patch popen</b><p>Dies holt den aktuellen Patch vom Stapel angewandter Patches unabhängig von lokalen Änderungen.</p></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>Holt allen Patches vom Stapel unabhängig von lokalen Änderungen</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><b>Alle Patches popen</b><p>Dies holt alle Patches vom Stapel angewandter Patches unabhängig von lokalen Änderungen.</p></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>Holt Patches vom Stapel unabhängig von lokalen Änderungen</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><b>Patches popen</b><p>Dies holt Patches vom Stapel angewandter Patches bis ein benannter Patch zuoberst liegt unabhängig von lokalen Änderungen.</p></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>Schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt unabhängig von lokalen Änderungen</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><b>Zu Patch wechseln</b><p>Dies schiebt Patches auf den Stapel oder holt sie herunter bis ein benannter Patch zuoberst liegt unabhängig von lokalen Änderungen.</p></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>Patchschlangen</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>Push/Pop</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>Push/Pop (force)</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><b>Patches auflisten</b><p>Dies listet alle angewandten und nicht angewandten Patches auf.</p></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><b>Patches pushen</b><p>Dies schiebt Patches auf den Stapel angewandter Patches bis ein benannter Patch zuoberst liegt.</p></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>Guards definieren</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>Guards definieren...</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>Guards für den aktuellen oder benannten Patch definieren</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><b>Guards definieren</b><p>Dies öffnet einen Dialog zur Definition von Guards für den aktuellen oder einen benannten Patch.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="398"/> + <source>Drop All Guards</source> + <translation>Alle Guards löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="398"/> + <source>Drop All Guards...</source> + <translation>Alle Guards löschen...</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>Alle Guards des aktuellen oder eines benannten Patches löschen</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><b>Alle Guards löschen</b><p>Dies löscht alle Guards des aktuellen oder eines benannten Patches.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="411"/> + <source>List Guards</source> + <translation>Guards anzeigen</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><b>Guards definieren</b><p>Dies öffnet einen Dialog zur Definition von Guards für den aktuellen oder einen benannten Patch.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> - <source>Drop All Guards</source> - <translation>Alle Guards löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> - <source>Drop All Guards...</source> - <translation>Alle Guards löschen...</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>Alle Guards des aktuellen oder eines benannten Patches löschen</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><b>Alle Guards löschen</b><p>Dies löscht alle Guards des aktuellen oder eines benannten Patches.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> - <source>List Guards</source> - <translation>Guards anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> <source>List Guards...</source> <translation>Guards anzeigen...</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>Zeigt Guards des aktuellen oder eines benannten Patches an</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><b>Guards anzeigen</b><p>Dies zeigt Guards des aktuellen oder eines benannten Patches an.</p></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>Alle Guards anzeigen</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>Alle Guards anzeigen...</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>Zeigt alle Guards aller Patches an</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><b>Alle Guards anzeigen</b><p>Dies zeigt alle Guards aller Patches an.</p></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>Aktive Guards setzen</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>Aktive Guards setzen...</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>Setzt die Liste aktiver Guards</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><b>Aktive Guards setzen</b><p>Dies öffnet einen Dialog, um die Liste aktiver Guards zu setzen.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="450"/> + <source>Deactivate Guards</source> + <translation>Guards deaktivieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="450"/> + <source>Deactivate Guards...</source> + <translation>Guards deaktivieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="453"/> + <source>Deactivate all active guards</source> + <translation>Alle Guards deaktivieren</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><b>Guards deaktivieren</b><p>Dies deaktiviert alle Guards.</p></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><b>Aktive Guards setzen</b><p>Dies öffnet einen Dialog, um die Liste aktiver Guards zu setzen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="471"/> - <source>Deactivate Guards</source> - <translation>Guards deaktivieren</translation> + <source>Identify Active Guards</source> + <translation>Aktive Guards anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="464"/> + <source>Identify Active Guards...</source> + <translation>Aktive Guards anzeigen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="468"/> + <source>Show a list of active guards</source> + <translation>Zeigt eine Liste aktiver Guards</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="471"/> - <source>Deactivate Guards...</source> - <translation>Guards deaktivieren...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="474"/> - <source>Deactivate all active guards</source> - <translation>Alle Guards deaktivieren</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><b>Guards deaktivieren</b><p>Dies deaktiviert alle Guards.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="485"/> - <source>Identify Active Guards</source> - <translation>Aktive Guards anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="485"/> - <source>Identify Active Guards...</source> - <translation>Aktive Guards anzeigen...</translation> + <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> + <translation><b>Aktive Guards anzeigen</b><p>Dies öffnet einen Dialog zur Anzeige einer Liste aktiver Guards.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="602"/> + <source>Guards</source> + <translation>Guards</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="483"/> + <source>Create Queue</source> + <translation>Patchschlange anlegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="486"/> + <source>Create a new patch queue</source> + <translation>Erzeugt eine neue Patchschlange</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="489"/> - <source>Show a list of active guards</source> - <translation>Zeigt eine Liste aktiver Guards</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><b>Aktive Guards anzeigen</b><p>Dies öffnet einen Dialog zur Anzeige einer Liste aktiver Guards.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="623"/> - <source>Guards</source> - <translation>Guards</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="504"/> - <source>Create Queue</source> - <translation>Patchschlange anlegen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="507"/> - <source>Create a new patch queue</source> - <translation>Erzeugt eine neue Patchschlange</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><b>Patchschlange anlegen</b><p>Dies erzeugt eine neue Patchschlange.</p></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>Patchschlange umbenennen</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>Benennt die aktive Patchschlange um</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><b>Patchschlange umbenennen</b><p>Dies benennt die aktive Patchschlange um.</p></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>Patchschlange löschen</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>Löscht die Referenz auf eine Patchschlange</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><b>Patchschlange löschen</b><p>Dies löscht die Referenz auf eine Patchschlange.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="525"/> + <source>Purge Queue</source> + <translation>Patchschlange säubern</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>Löscht die Referenz auf eine Patchschlange und entfernt das Patchverzeichnis</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><b>Patchschlange säubern</b><p>Dies löscht die Referenz auf eine Patchschlange und entfernt das Patchverzeichnis.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="540"/> + <source>Activate Queue</source> + <translation>Patchschlange aktivieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="543"/> + <source>Set the active queue</source> + <translation>Setzt die aktive Patchschlange</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="546"/> - <source>Purge Queue</source> - <translation>Patchschlange säubern</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>Löscht die Referenz auf eine Patchschlange und entfernt das Patchverzeichnis</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><b>Patchschlange säubern</b><p>Dies löscht die Referenz auf eine Patchschlange und entfernt das Patchverzeichnis.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="561"/> - <source>Activate Queue</source> - <translation>Patchschlange aktivieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="564"/> - <source>Set the active queue</source> - <translation>Setzt die aktive Patchschlange</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><b>Patchschlange aktivieren</b><p>Dies setzt die aktive Patchschlange.</p></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>Patchschlangen auflisten</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>Patchschlangen auflisten...</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>Listet die verfügbaren Patchschlangen auf</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><b>Patchschlangen auflisten</b><p>Dies öffnet einen Dialog zur Anzeige aller verfügbaren Patchschlangen.</p></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>Patchschlangenverwaltung</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>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</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>Angewandte Patches ändern</translation> </message> </context> <context> + <name>Rebase</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> + <source>Rebase Changesets</source> + <translation>Änderungssätze umgruppieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="107"/> + <source>Rebase Changesets (Continue)</source> + <translation>Änderungssätze umgruppieren (Fortsetzung)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="134"/> + <source>Rebase Changesets (Abort)</source> + <translation>Änderungssätze umgruppieren (Abbruch)</translation> + </message> +</context> +<context> + <name>RebaseProjectHelper</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="107"/> + <source>Rebase Changesets</source> + <translation>Änderungssätze umgruppieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="38"/> + <source>Rebase changesets to another branch</source> + <translation>Änderungssätze in einen anderen Zweig umgruppieren</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><b>Änderungssätze umgruppieren</b><p>Dies gruppiert Änderungssätze in einen anderen Zweig um.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="48"/> + <source>Continue Rebase Session</source> + <translation>Umgruppierungssitzung fortsetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="52"/> + <source>Continue the last rebase session after repair</source> + <translation>Setzt die letzte Umgruppierungssitzung nach Reparatur fort</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><b>Umgruppierungssitzung fortsetzen</b><p>Dies setzt die letzte Umgruppierungssitzung nach Reparatur fort.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="62"/> + <source>Abort Rebase Session</source> + <translation>Umgruppierungssitzung abbrechen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="66"/> + <source>Abort the last rebase session</source> + <translation>Bricht die letzte Umgruppierungssitzung ab</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><b>Umgruppierungssitzung abbrechen</b><p>Dies bricht die letzte Umgruppierungssitzung ab.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="98"/> + <source>Rebase</source> + <translation>Umgruppieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <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/RebaseExtension/ProjectHelper.py" line="121"/> + <source>Rebase Changesets (Continue)</source> + <translation>Änderungssätze umgruppieren (Fortsetzung)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="135"/> + <source>Rebase Changesets (Abort)</source> + <translation>Änderungssätze umgruppieren (Abbruch)</translation> + </message> +</context> +<context> <name>ReplaceWidget</name> <message> <location filename="QScintilla/ReplaceWidget.ui" line="14"/> @@ -41039,13 +41303,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>Änderungssätze transplantieren</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>Änderungssätze transplantieren (Fortsetzung)</translation> </message> </context> @@ -41130,49 +41394,49 @@ <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>Änderungssätze transplantieren</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="38"/> + <source>Transplant changesets from another branch</source> + <translation>Änderungssätze aus einem anderen Zweig transplantieren</translation> + </message> + <message> + <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><b>Änderungssätze transplantieren</b><p>Dies transplantier Änderungssätze aus einem anderen Zweig mit der Originaländerungsmeldung in das Arbeitsverzeichnis.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="53"/> + <source>Continue the last transplant session after repair</source> + <translation>Setzt die letzte Transplantationssitzung nach Reparatur fort</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="84"/> + <source>Transplant</source> + <translation>Transplantation</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <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/TransplantExtension/ProjectHelper.py" line="107"/> + <source>Transplant Changesets (Continue)</source> + <translation>Änderungssätze transplantieren (Fortsetzung)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="49"/> + <source>Continue Transplant Session</source> + <translation>Transplantationssitzung fortsetzen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> - <source>Transplant changesets from another branch</source> - <translation>Änderungssätze aus einem anderen Zweig transplantieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="59"/> - <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><b>Änderungssätze transplantieren</b><p>Dies transplantier Änderungssätze aus einem anderen Zweig mit der Originaländerungsmeldung in das Arbeitsverzeichnis.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="67"/> - <source>Continue</source> - <translation>Fortsetzen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> - <source>Continue the last transplant session after repair</source> - <translation>Setzt die letzte Transplantationssitzung nach Reparatur fort</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><b>Fortsetzen</b><p>Dies setzt die letzte Transplantationssitzung nach Reparatur fort.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="100"/> - <source>Transplant</source> - <translation>Transplantation</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="123"/> - <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/TransplantExtension/ProjectHelper.py" line="123"/> - <source>Transplant Changesets (Continue)</source> - <translation>Änderungssätze transplantieren (Fortsetzung)</translation> + <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> + <translation><b>Transplantationssitzung fortsetzen</b><p>Dies setzt die letzte Transplantationssitzung nach Reparatur fort.</p></translation> </message> </context> <context> @@ -47908,24 +48172,24 @@ <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>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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>Marken</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>Zweige</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> @@ -47934,7 +48198,7 @@ <tr><td><b>Committed um</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> @@ -47951,24 +48215,24 @@ {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>Spitze</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>Änderungssatz</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>Vorgänger</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> @@ -47979,7 +48243,7 @@ </table></p></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><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_en.ts Tue May 31 16:35:45 2011 +0200 @@ -1355,62 +1355,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> @@ -1637,167 +1637,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"></translation> </message> @@ -11400,7 +11400,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 type="unfinished"></translation> </message> @@ -11408,27 +11408,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"></translation> </message> @@ -12221,12 +12221,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> @@ -12234,57 +12234,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> @@ -15130,247 +15130,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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="1990"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Preview changegroup</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 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> @@ -16269,12 +16269,12 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -17454,1022 +17454,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Export from repository</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 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="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Specials</source> <translation type="unfinished"></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 type="unfinished"></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 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"></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"></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> @@ -19020,6 +19020,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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation type="unfinished"></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"/> @@ -29092,22 +29270,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> @@ -29115,77 +29293,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> @@ -31069,177 +31247,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> @@ -31247,622 +31425,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"></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"></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"/> @@ -40664,13 +40928,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> @@ -40755,48 +41019,48 @@ <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="38"/> + <source>Transplant changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="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="84"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="107"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <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>Transplant changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="59"/> - <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"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> - <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"/> - <source>Transplant</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="123"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="123"/> - <source>Transplant Changesets (Continue)</source> + <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -47516,30 +47780,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -47550,23 +47814,23 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -47574,7 +47838,7 @@ <translation type="unfinished"></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_es.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_es.ts Tue May 31 16:35:45 2011 +0200 @@ -1378,62 +1378,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> @@ -1662,167 +1662,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">Marcadores</translation> </message> @@ -11543,7 +11543,7 @@ <translation type="obsolete">Haciendo pull de un repositorio remoto Mercurial</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> @@ -11551,27 +11551,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">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -12366,12 +12366,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> @@ -12379,57 +12379,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> @@ -15276,247 +15276,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>El proceso hg ha terminado con código de salida {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>El proceso hg no terminó en un plazo de 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>No se ha podido iniciar el ejecutable de hg.</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>Crear repositorio del proyecto</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>No se ha podido crear el repositorio del proyecto.</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>Creando repositorio Mercurial</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>Commit inicial al repositorio Mercurial</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>Clonando proyecto desde un repositorio Mercurial</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>Haciendo commit de cambios al repositorio Mercurial</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>Sincronizando con el repositorio Mercurial</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>Añadiendo archivos/directorios al repositorio Mercurial</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>Eliminando archivos/directorios del repositorio Mercurial</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>Renombrando {0}</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>Haciendo un merge</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>Copiando {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>Registro de Mercurial</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>Seleccionar número de entradas a mostrar.</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>Haciendo pull de un repositorio remoto Mercurial</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>Haciendo push a un repositorio remoto Mercurial</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>Resolviendo archivos/directorios</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>Haciendo tag en el repositorio Mercurial</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>Revirtiendo cambios</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>Comando de Mercurial</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>Crear Branch</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>Introducir nombre de branch</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>Creando branch en el repositorio Mercurial</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>Verificando la integridad del repositorio Mercurial</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>Mostrando los ajustes de configuración combinados</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>Mostrando alias para repositorios remotos</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>Recuperando de transacción interrumpida</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>¿Debe ser actualizado el directorio de trabajo?</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>Mostrando la branch actual</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>Crear changegroup</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>Aplicar changegroups</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>Subcomando bisect ({0}) inválido.</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>Previsualizar changegroup</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>Identificando directorio de proyecto</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>Crear archivo .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>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</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>Eliminando archivos unicamente del repositorio Mercurial</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>Archivos Changegroup de Mercurial (*.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>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</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>Identificando archivo de changegroup</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>Haciendo respaldo de changeset</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>No se ha proporcionado revisión. Abortando...</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>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <source>Rollback last transaction</source> + <translation>Hacer Rollback de la última transacción</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2198"/> - <source>Rollback last transaction</source> - <translation>Hacer Rollback de la última transacción</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>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> @@ -16423,12 +16423,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>Error de Generación de Proceso</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>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -17624,587 +17624,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>Nuevo desde repositorio</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>&Nuevo desde repositorio...</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>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</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>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> <source>Show incoming log</source> <translation>Mostrar log entrante</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>Mostrar el log de los cambios entrantes</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>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>Pull changes</source> <translation>Hacer pull de cambios</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>Hacer pull de cambios desde un repositorio remoto</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>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Update from repository</source> <translation>Hacer update desde repositorio</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>Hacer &update desde repositorio</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>Actualizar el proyecto local desde el repositorio Mercurial</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>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>Commit changes to repository</source> <translation>Hacer commit de los cambios al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>&Commit changes to repository...</source> <translation>Hacer &commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Hacer commit de los cambios al repositorio</b>Envia los cambios del proyecto local al repositorio Mercurial.</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>Mostrar log saliente</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>Mostrar el log de los cambios salientes</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>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>Push changes</source> <translation>Hacer push de cambios</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>Hacer push de cambios hacia un repositorio remoto</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>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Export from repository</source> <translation>Exportar desde repositorio</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>&Exportar desde repositorio...</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>Exportar un proyecto desde el repositorio</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>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</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>Añadir al repositorio</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>&Añadir al repositorio...</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>Añadir el proyecto local al repositorio</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>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio.</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>Eliminar del repositorio (y del disco)</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>Eliminar del &repositorio (y del disco)</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>Eliminar el proyecto local del repositorio (y del disco)</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>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio (y del disco).</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>Mostrar 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>Mostrar &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>Mostrar el log del proyecto local</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>Mostrar log</b><p>Muestra el log del proyecto local.</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>Mostrar log limitado</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>Muestra un log limitado del proyecto local</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>Mostrar log limitado</b><p>Muestra el log del proyecto local limitado a un número seleccionable de entradas.</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>Mostrar navegador de log</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>Mostrar un diálogo para navegar el log del proyecto local</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>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show difference</source> <translation>Mostrar diferencia</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>Mostrar &diferencia</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>Muestra las diferencias entre el proyecto local y el repositorio</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>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</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>Mostrar diferencia (extendida)</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>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</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>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</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>Mostrar heads</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>Mostrar los heads del repositorio</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>Mostrar heads</b><p>Muestra los heads del repositorio.</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>Mostrar parents</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>Mostrar los parents del repositorio</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>Mostrar parents</b><p>Muestra los parents del repositorio.</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>Mostrar 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>Mostrar el tip del repositorio</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>Mostrar tip</b><p>Muestra el tip del repositorio.</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>Hacer merge</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>Hacer mer&ge de los cambios...</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>Hacer merge de los cambios de una revision en el proyecto local</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>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source>Resolve conflicts</source> <translation>Resolver conflictos</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>Resolver con&flictos</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>Resolver todos los conflictos del proyecto local</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>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</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>Mostrar estado</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>Mostrar e&stado</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>Mostrar el estado del proyecto local</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>Mostrar estado</b><p>Muestra el estado del proyecto local.</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>Revertir cambios</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>Re&vertir cambios</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>Revertir todos los cambios hechos al proyecto local</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>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</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>Crear un Tag en el repositorio</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>Crear un &Tag en el repositorio...</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>Crea un tag del proyecto local en el repositorio</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>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags</source> <translation>Listar tags</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>Listar tags...</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>Lista los tags del proyecto</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>Listar tags</b><p>Lista los tags del proyecto.</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>Listar branches</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>Listar branches...</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>Lista las branches del proyecto</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>Listar branches</b><p>Lista las branches del proyecto.</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>Crear branch</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>Crear &branch...</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>Crear una nueva branch para el proyecto local en el repositorio</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>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Close branch</source> <translation>Cerrar branch</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>Cerrar la branch actual para el proyecto local</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>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</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>Hacer switch</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>Hacer s&witch...</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>Hacer switch del directorio de trabajo a otra revisión</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>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="526"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</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>Lim&piar (cleanup)</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>Limpiar (cleanup) el proyecto local</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>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</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>Ejecutar comando</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>E&jecutar comando...</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>Ejecuta un comando Mercurial arbitrario</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>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command options</source> <translation>Opciones de comando</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>&Opciones de comando...</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>Mostrar opciones de comando Mercurial</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>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</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>Configurar</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>Configurar...</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>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> @@ -18249,437 +18249,437 @@ <translation type="obsolete"><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados con todos los archivos de configuración.</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>Mostrar rutas</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>Mostrar rutas...</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>Mostrar los alias para los repositorios remotos</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>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</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>Verificar repositorio</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>Verificar repositorio...</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>Verificar la integridad del repositorio</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>Verificar repositorio</b><p>Verifica la integridad del repositorio.</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>Recuperar</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>Recuperar...</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>Recuperar de una transacción interrumpida</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>Recuperar</b><p>Recupera de una transacción interrumpida.</p></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>Crear .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>Creare un archivo .hgignore con valores por defecto</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>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Repository Administration</source> <translation>Administración del Repositorio</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>Crear changegroup</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>Crear changegroup...</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>Crea un archivo de changegroup recogiendo changesets</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>Aplicar changegroups</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>Aplicar changegroups...</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>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</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>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source>Show current branch</source> <translation>Mostrar la branch actual</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>Mostrar la branch actual del proyecto</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>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</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>Marcar como "bueno"</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>Marcar un changeset seleccionable como bueno</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>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</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>Marcar como "malo"</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>Marcar un changeset seleccionable como malo</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>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</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>Saltar</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>Saltar el changeset actual</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>Saltar</b><p>Salta el changeset actual.</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>Reiniciar</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>Reiniciar los datos de búsqueda de 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>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</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>Marcar como "bueno"...</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>Marcar como "malo"...</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>Previsualizar changegroup</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>Previsualizar changegroup...</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>Identificar</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>Identificar...</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>Identificar el directorio de proyecto</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>Identificar</b><p>Identifica el directorio de proyecto.</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>Previsualizar un archivo de changegroup conteniendo una colección de changesets</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>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup</source> <translation>Identificar changegroup</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>Identificar changegroup...</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>Identificar un archivo de changegroup conteniendo una colección de changesets</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>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</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>Hacer respaldo de changeset</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>Hacer respaldo de cambios de un changeset anterior</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>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Push changes (force)</source> <translation>Hacer push de cambios (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>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Specials</source> <translation>Especial</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>Servir repositorio de proyecto</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>Servir repositorio de proyecto...</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>Servir el repositorio de proyecto</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>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</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>Hacer 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>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</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>Hacer push de nueva rama</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>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</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>Rollback de la última transacción</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><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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> @@ -19235,6 +19235,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">Seleccionar para especificar una revisión por número</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">Número</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Introduzca un número de revisión</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">Seleccionar para especificar una revisión por changeset id</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">Introduzca un changeset id</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">Seleccionar para especificar una revisión por tag</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">Introduzca un nombre de tag</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introducir un nombre de branch</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">Seleccionar revisión tip del repositorio</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="29"/> @@ -29368,22 +29546,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> @@ -29391,77 +29569,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> @@ -31423,177 +31601,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> @@ -31601,622 +31779,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">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</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">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</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"/> @@ -41130,13 +41394,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> @@ -41221,50 +41485,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">Continuar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Continuar</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">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</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> @@ -47995,17 +48264,17 @@ <context> <name>mercurial</name> <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>Etiquetas</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>Branches</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> @@ -48016,31 +48285,31 @@ </table></p></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>Pista</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>Changeset</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>Padres</b></td><td>{0}</td></tr></translation> </message> <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>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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> @@ -48049,7 +48318,7 @@ <tr><td><b>Hora de commit</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> @@ -48066,7 +48335,7 @@ {2}</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_fr.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_fr.ts Tue May 31 16:35:45 2011 +0200 @@ -1564,62 +1564,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">Supprimer le signet</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> @@ -1851,167 +1851,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">Signets</translation> </message> @@ -12553,7 +12553,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 type="unfinished"></translation> </message> @@ -12561,27 +12561,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"></translation> </message> @@ -13410,12 +13410,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> @@ -13423,57 +13423,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> @@ -16685,247 +16685,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Revenir avant les modifications</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Sélectionner plusieurs entrées à afficher.</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -17828,12 +17828,12 @@ <translation type="unfinished">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 type="unfinished">Erreur du processus</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 type="unfinished"></translation> </message> @@ -19044,1022 +19044,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 type="unfinished">Nouveau à partir du référentiel</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 type="unfinished">&Nouveau depuis un référentiel...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Mettre à jo&ur à partir du référentiel</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">"Commiter" les modifications au référentiel</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 type="unfinished">&Appliquer les changements dans le référentiel...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Exporter du référentiel</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 type="unfinished">&Exporter du référentiel...</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 type="unfinished">Exporte un projet d'un référentiel VCS</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 type="unfinished"><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> <translation type="unfinished"></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 type="unfinished">&Ajouter au référentiel...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Supprimer du référentiel (et du disque)</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 type="unfinished">&Supprimer du référentiel (et du disque)</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Afficher le 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 type="unfinished">Afficher le &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 type="unfinished">Affiche le log du projet local</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 type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</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 type="unfinished">Afficher un log limité</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 type="unfinished">Afficher un log limité du projet local</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 type="unfinished"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</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 type="unfinished">Afficher le navigateur de logs</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 type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</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 type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</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 type="unfinished">Afficher les &différences</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 type="unfinished">Affiche les différences entre le projet local et le référentiel</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 type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</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 type="unfinished">Afficher les différences (étendu)</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 type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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 type="unfinished"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</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 type="unfinished">Afficher l'état (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 type="unfinished">Affich&er l'état VCS</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 type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</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 type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> <source>Show heads</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Revenir avant les modifications</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 type="unfinished">&Recharger le projet</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 type="unfinished">Recharger le projet et écraser toutes les modifications locales</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 type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Merge</source> <translation type="unfinished">Fusionner</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 type="unfinished">&Fusionner les modifications...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Résoudre les confits</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 type="unfinished">Résoudre les con&fits</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 type="unfinished">Résout tous les conflits du projet local</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 type="unfinished"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</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 type="unfinished">Etiqueter au niveau du référentiel (tag)</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 type="unfinished">&Etiqueter dans le référentiel...</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 type="unfinished">Etiquette le projet local dans le référentiel</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 type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>List tags</source> <translation type="unfinished">Lister les étiquettes</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 type="unfinished">Lister les étiquettes...</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 type="unfinished">Liste les étiquettes du projet</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 type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</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 type="unfinished">Lister les branches</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 type="unfinished">Lister les branches...</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 type="unfinished">Liste les branches du projet</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 type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> <source>Create &branch...</source> <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Basculer de version</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 type="unfinished">&Basculer de version...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Nettoyer</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 type="unfinished">&Nettoyer</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 type="unfinished">Nettoyer le projet local</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 type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</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 type="unfinished">Exécuter une commande</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 type="unfinished">E&xécuter une commande...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Options de commande</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 type="unfinished">&Options de commande...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Configuration</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 type="unfinished">Configuration...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Passer</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">Réinitialiser</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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="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="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="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <source>Pull</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>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>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> @@ -20615,6 +20615,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">Sélectionner pour spécifier une révision par son numéro</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">Numéro</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Entrer un numéro de révision</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation type="unfinished"></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"/> @@ -32006,22 +32184,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> @@ -32029,77 +32207,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> @@ -34234,177 +34412,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> @@ -34412,622 +34590,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"></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"></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>ReplaceDialog</name> <message> <location filename="QScintilla/Ui_ReplaceDialog.py" line="152"/> @@ -44937,13 +45201,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> @@ -45028,50 +45292,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">Continuer</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Continuer</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"></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> @@ -52608,30 +52877,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -52642,23 +52911,23 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -52666,7 +52935,7 @@ <translation type="unfinished"></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_it.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_it.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> @@ -1664,167 +1664,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">Segnalibri</translation> </message> @@ -11486,7 +11486,7 @@ <translation type="obsolete">Pulling da un repository Mercurial remoto</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> @@ -11494,27 +11494,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">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -12309,12 +12309,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> @@ -12322,57 +12322,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> @@ -15218,247 +15218,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>Il processo hg è terminato con codice di uscita {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>Il processo hg non è finito entro i 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>Non posso avviare l'eseguibile hg.</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>Crea il repository del progetto</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>Il repository del progetto non può essere creato.</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>Creazione repository Mercurial</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>Commit iniziale nel repository Mercurial</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>Clonazione del progetto dal repository Mercurial</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>Commit delle modifiche nel repository Mercurial</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>Sincronizzazione con il repository Mercurial</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>Aggiunta di file/directory al repository Mercurial</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>Rimozione di file/directory dal repository Mercurial</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>Rinomino {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>Creazione tag nel repository Mercurial</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>Annullamento modifiche</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>Merge</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>Comando Mercurial</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>Copia di {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>Mostra il numero di elementi da mostrare.</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>Pulling da un repository Mercurial remoto</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>Pushing in un repository Mercurial remoto</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>Risoluzione di file/directory</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>Creazione Branch</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>Inserisci il nome del Branch</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>Creazione Branch nel repository Mercurial</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>Verifica dell'integrità del repository Mercurial</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>Visualizzazione combinata della impostazioni di configurazione</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>Visualizzazione degli alias per i repository remoti</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>Recupero da una transazione interrotta</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>Le directory di lavoro devono essere aggiornate ?</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>Visualizzazione branch corrente</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>Crea changegroup</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>Applica changegroup</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>Sottocomando Bisect ({0}) non valido.</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>Anteprima changegroup</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>Identificazione directory del progetto</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>Crea il file .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>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</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>Rimozione di file dal solo repository Mercurial</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 Changegroup Files (*.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 Changegroup Files (*.hg);;All Files (*)</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>Identifica i file changegroup</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>Ritiro changeset</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>Nessuna revisione fornita. Termino...</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>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></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> @@ -16364,12 +16364,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>Errore Generazione Processo</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>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -17565,587 +17565,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>Nuovo dal 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>&Nuovo dal 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>Crea (clone) un nuovo progetto da un repository Mercurial</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>Nuovo dal repository</b><p>Crea (clone) un nuovo progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> <source>Show incoming log</source> <translation>Mostra log in ingresso</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>Mostra il log delle modifiche in ingresso</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>Mostra log in ingresso</b><p>Mostra il log delle modifiche che entrano nel repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> <source>Pull changes</source> <translation>Pull modifiche</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>Pull changes da un repository remoto</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>Pull modifiche</b><p>Scarica le modifiche da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Update from repository</source> <translation>Aggiorna da 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>&Aggiorna da 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>Aggiorna il progetto locate da un repository Mercurial</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>Aggiorna dal repository</b><p>Aggiorna il progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>Commit changes to repository</source> <translation>Committa le modifica nel repository</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>&Committa le modifica nel repository...</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>Committa le modifiche al progetto locale nel repository Mercurial</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>Committa modifiche al repository</b><p>Committa le modifiche al progetto locale nel repository Mercurial.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>Show outgoing log</source> <translation>Mostra log in uscita</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>Mostra il log della modifiche in uscita</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>Mostra log in uscita</b><p>Mostra il log della modifiche che escono dal repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>Push changes</source> <translation>Push modifiche</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>Push modifiche ad un repository remoto</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>Push delle modifiche</b><p>Push delle modifiche dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="208"/> <source>Export from repository</source> <translation>Esporta dal 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>&Esporta dal 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>Esporta il progetto dal 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>Esporta dal repository</b><p>Esporta un progetto dal 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>Aggiungi al repository</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>&Aggiungi al repository...</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>Aggiungi il progetto locale al repository</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>Aggiungi al repository</b><p>Aggiunte (imports) il progetto locate la repository.</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>Rimuovi dal repository (e dal disco)</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>&Rimuovi dal repository (e dal disco)</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>Rimuovi il progetto locate dal repository (e dal disco)</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>Rimuovi dal repository</b><p>Rimuove il progetto locale dal repository (e dal disco).</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>Mostra 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>Mostra &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>Mostra i log del progetto locale</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>Mostra log</b><p>Mostra i log del progetto locale.</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>Mostra log ridotto</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>Mostra il log ridotto del progetto locale</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>Mostra log ridotto</b><p>Mostra il log del progetto locale limitato ad un numero selezionabile di elementi.</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>Mostra il browser dei log</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>Mostra un dialogo per navigare i log del progetto locale</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>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show difference</source> <translation>Mostra differenza</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>Mostra &differenza</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>Mostra le differenze tra il progetto locale e il repository</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>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</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>Mostra differenza (esteso)</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>Mostra le differenze tra la revisione del progetto e il repository</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>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</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>Mostra stato</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>Mostra &stato</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>Mostra lo stato del progetto locale</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>Mostra stato</b><p>Mostra lo stato del progetto locale.</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>Mostra head</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>Mostra head del repository</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>Mostra head</b><p>Mostra l'head del repository.</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>Mostra predecessori</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>Mostra il predecessori del repository</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>Mostra predecessori</b><p>Mostra i predecessori del repository.</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>Mostra 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>Mostra il tip del repository</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>Mostra tip</b><p>Mostra il tip del repository.</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>Annulla modifiche</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>In&verti modifiche</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>Inverti tutte le modifiche fatte al progetto locale</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>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</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>Fondi</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>Fon&di modifiche...</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>Fondi le modifiche dela revisione nel progetto locale</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>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</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>Risolvi conflitti</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>Risolvi con&flitti</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>Risolvi tutti i conflitti del progetto locale</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>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</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>Tag nel repository</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>&Tag nel repository...</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>Tag del progetto locale nel repository</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>Tag nel repository</b><p>Tag del progetto locale nel 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>Elenca 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>Elenca 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>Elenca i tag del progetto</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>Elenca tag</b><p>Elenca i tag del progetto.</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>Elenca branches</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>Elenca branches...</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>Elenca i branches del progetto</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>Elenca branches</b><p>Elenca i branch del progetto.</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>Crea Branch</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>Crea &Branch...</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>Crea un nuovo branch per il progetto locale nel 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>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Close branch</source> <translation>Chiudi branch</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>Chiudi il branch corrente del progetto locale</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>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</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>Switch</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>S&witch...</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>Switch della directory di lavoro ad un'altra revisione</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>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</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>Pulisci</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>&Pulisci</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>Pulisci il progetto locale</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>Pulizia</b><p>Esegue la pulizia del progetto locale.</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>Esegui comando</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>&Esegui comando...</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>Esegui un comando Mercurial arbitrario</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>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="552"/> <source>Command options</source> <translation>Opzione comando</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>&Opzioni comando...</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>Mostra le opzioni del comando Mercurial</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>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando Mercurial.</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>Configura</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>Configura...</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>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</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>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> @@ -18190,437 +18190,437 @@ <translation type="obsolete"><b>Mostra configurazioni combinate</b><p>Mostra configurazioni combinate da tutti i file di configurazione.</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>Mostra percorsi</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>Mostra percorsi...</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>Mostra alias per i repository remoti</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>Mostra percorsi</b><p>Mostra alias per i repository remoti.</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>Verifica repository</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>Verifica repository...</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>Verifica l'integrità del 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>Verifica repository</b><p>Verifica l'integrità del 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>Recover</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>Recover...</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>Recupera da una transazione interrotta</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>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> <source>Repository Administration</source> <translation>Amministrazione repository</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>Crea .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>Crea una file .hgignore con i valori di default</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>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Create changegroup</source> <translation>Crea changegroup</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>Crea changegroup...</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>Crea un file changegroup che colleziona i changeset</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>Applica changegroups</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>Applica changegroups...</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>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> <source>Changegroup Management</source> <translation>Changegroup Management</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>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="499"/> <source>Show current branch</source> <translation>Mostra branch corrente</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>Mostra il brach corrente del progetto</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>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</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>Segna come "good"</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>Segna un chageset selezionabile come good</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>Segna come "good"</b><p>Segna un chageset selezionabile come good.</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>Segna come "bad"</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>Segna un chageset selezionabile come bad</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>Segna come bad</b><p>Segna un chageset selezionabile come bad.</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>Salta</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>Salta il changeset corrente</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>Skip</b><p>Salta il changest corrente.</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>Resetta</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 dei dati di ricerca 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>Reset dei dati di ricerca bisect.</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>Segna come "good"...</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>Segna come "bad"...</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>Anteprima changegroup</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>Anteprima changegroup...</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>Identify</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>Identify...</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>Identifica la directory del progetto</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>Identify</b><p>Identifica la directory del progetto.</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>Anteprima di un file changegroup contenente una collezione di changeset</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>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Identify changegroup</source> <translation>Identifica changegroup</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>Identifica changegroup...</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>Identifica un changegroup contenente una collezione di changeset</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>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</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>Ritiro changeset</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>Ritiro changeset di un changeset precedente</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>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</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>Push delle modifiche (forza)</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>Push delle modifiche verso un repository remoto con l'opzione force</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>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Serve project repository</source> <translation>Servi repository del progetto</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>Servi repository del progetto...</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>Servi il repository del progetto</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>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> <source>Specials</source> <translation>Speciali</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>Il progetto deve essere riletto. Farlo ora ?</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> @@ -19171,6 +19171,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">Seleziona per specificare una revisione con un numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">Numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Inserisci un numero di revisione</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">Seleziona per specificare la revisione dall'id del changeset</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">Inserisci id del changeset</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">Seleziona per specificare una revisione con un tag</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">Inserisci il nome del tag</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">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</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">Seleziona la revisione tip del reposutory</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"/> @@ -29288,22 +29466,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> @@ -29311,77 +29489,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> @@ -31344,177 +31522,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> @@ -31522,622 +31700,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="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="117"/> + <source>Finish Applied Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <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><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="138"/> - <source>Finish Applied Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="141"/> - <source>Finish applied patches</source> + <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="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="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="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="656"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <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="590"/> + <source>Push/Pop (force)</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="675"/> - <source>Queues</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="599"/> - <source>Push/Pop</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="611"/> - <source>Push/Pop (force)</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">Il progetto deve essere riletto. Farlo ora ?</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">Il progetto deve essere riletto. Farlo ora ?</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"/> @@ -41061,13 +41325,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> @@ -41152,50 +41416,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">Continua</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Continua</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">Il progetto deve essere riletto. Farlo ora ?</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> @@ -47927,24 +48196,24 @@ <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>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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>Tags</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>Branches</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> @@ -47953,7 +48222,7 @@ <tr><td><b>Committed time</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> @@ -47970,24 +48239,24 @@ {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>Changeset</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>Origini</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> @@ -47997,7 +48266,7 @@ <tr><td><b>Committed time</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_ru.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_ru.ts Tue May 31 16:35:45 2011 +0200 @@ -1377,62 +1377,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> @@ -1661,167 +1661,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">Закладки</translation> </message> @@ -11582,7 +11582,7 @@ <translation type="obsolete">Загрузка изменений из удалённого репозитория</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> @@ -11590,27 +11590,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">Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -12407,12 +12407,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> @@ -12420,57 +12420,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> @@ -15325,247 +15325,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>Процесс hg завершился с кодом возврата {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 не завершился в течение 30 секунд.</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>Невозможно запустить исполняемый файл hg.</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>Создать репозиторий проекта</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>Не могу создать репозиторий проекта.</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>Создание репозитория</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>Первичная подача в репозиторий</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>Создание копии репозитория</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>Подача изменений в репозиторий</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>Синхронизация с репозиторием</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>Добавление файлов/каталогов в репозиторий</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>Удаление файлов/каталогов из репозитория</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>Переименование {0}</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>Слияние</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>Копирование {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>лог</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>Задайте количество элементов для отображения.</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>Загрузка изменений из удалённого репозитория</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>Загрузка изменений в удалённый репозиторий</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>Разрешение конфликтов</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>Создание меток в репозитории</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>Отмена изменений</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 команда</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>Создать ветвь</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>Введите имя ветви</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>Создание ветвив репозитории</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>Проверка целостности репозитория</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>Показ комбинированных настроек</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>Алиасы для удалённых репозиториев</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>Восстановление после прерванной транзакции</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>Обновить рабочий каталог?</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>Текущая ветвь</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>Создать группу изменений</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>Применить группу изменений</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>Неправильная подкоманда ({0}) для Bisect.</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>Предпросмотр группы изменений</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>Каталог проекта</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</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>Файл <b>{0}</b> уже существует. Перезаписать?</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>Удаление файлов только из репозитория</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 файлы изменений (*.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 файлы изменений (*.hg);;Все файлы (*)</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>Файлы изменений</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>Отмена изменений</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>Не задана ревизия. Отмена...</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>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></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> @@ -16471,12 +16471,12 @@ <translation>Alt+П</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>Ошибка процесса генерации</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>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -17677,587 +17677,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>Новый из репозитория</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>&Новый из репозитория...</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>Создание копии репозитория</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>Новый из репозитория</b><p>Создать (скопировать) новый проект из репозитория.</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>Показать журнал входящих изменений</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>Показать журнал входящих изменений</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>Показать журнал изменений</b><p>Показать журнал входящих в репозиторий изменений.</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>Загрузить изменения</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>Загрузка изменений из удалённого репозитория</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>Загрузить изменения</b><p>Обновить локальный проект из удалённого репозитория.</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>Обновить из репозитория</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>&Обновить из репозитория</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>Обновить локальный проект из репозитория</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>Обновить из репозитория</b><p>Обновить локальный проект из репозитория.</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>Сохранение изменения в репозиторий</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>&Сохранение изменения в репозиторий...</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>Сохранить изменения локального проекта в репозиторий</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>Сохранение изменения в репозиторий</b><p>Сохранить изменения локального проекта в репозиторий.</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>Показать журнал выходящих изменений</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>Показать журнал выходящих изменений</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>Показать журнал изменений</b><p>Показать журнал выходящих из репозитория изменений.</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>Послать изменения</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>Послать изменения в удалённый репозиторий</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>Послать изменения</b><p>Послать изменения из локального проекта в удалённый репозиторий.</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>Экспорт из репозитория</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>&Экспорт из репозитория...</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>Экспортировать проект из репозитория</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>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</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>Добавить в репозиторий</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>&Добавить в репозиторий...</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>Добавить локальный проект в репозиторий</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>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий.</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>Удаление из репозитория (и с диска)</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>&Удалить из репозитория (и с диска)</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>Удалить локальный проект из репозитория (и диска)</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>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</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>Показать журнал</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>Показать &журнал</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>Показать журнал изменений локального проекта</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>Показать журнал</b><p>Показать журнал изменений локального проекта.</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>Показать ограниченный журнал</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>Показать ограниченный журнал изменений локального проекта</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>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</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>Показать проводник журналов</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>Показать диалог для навигации по файлу журнала для локального проекта</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>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</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>Показать различие</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>Показать &различие</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>Показать изменения между репозиторием и локальной копией</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>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</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>Показать различие (расширенно)</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>Показать разницу версий между репозиторием и локальной копией</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>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</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>Показать текущие версии</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>Показать текущие версии в репозитории</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>Показать текущие версии</b><p>Показать текущие версии в репозитории.</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>Показать предков</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>Показать предков репозитория</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>Показать предков</b><p>Показать предков репозитория.</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>Показать 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>Показать tip репозитория</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>Показать tip</b><p>Показать tip репозитория.</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>Слить</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>С&лить изменения...</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>Слить изменения из ревизии с локальным проектом</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>Слить</b><p>Слить изменения из ревизии с локальным проектом.</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>Разрешить конфликты</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>Разрешить кон&фликты</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>Разрешить все конфликты, возникшие в локальном проекте</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>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</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>Показать статус</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>Показать &статус</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>Показать статус локального проекта</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>Показать статус</b><p>Показать статус локального проекта.</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>Отмена изменений</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>От&мена изменений</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>Отменить все изменения в локальном проекте</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>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</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>Создать метку в репозитории</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>Создать &метку в репозитории...</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>Создать в репозитории метку для проекта</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>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</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>Список меток</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>Список меток...</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>Список меток текущего проекта</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>Список меток</b><p>Отображает список меток текущего проекта.</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>Список ветвей</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>Список ветвей...</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>Список ветвей текущего проекта</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>Список ветвей</b><p>Отображает список ветвей текущего проекта.</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>Создать ветвь</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>Создать &ветвь...</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>Создать новую ветвь в репозитории для локального проекта</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>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</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>Закрыть ветвь</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>Закрыть ветвь локального проекта</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>Закрыть ветвь</b><p>Закрыть ветвь в репозитории для локального проекта.</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>Переключиться</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>Пе&реключиться...</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>Переключить рабочий каталог на другую ревизию</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>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</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>Очистка</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>О&чистка</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>Очистить локальный проект</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>Очистка</b><p>Очистить локальный проект.</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>Выполнить команду</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>В&ыполнить команду...</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>Выполнить произвольную команду Mercurial</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>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</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>Опции командной строки</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>&Опции командной строки...</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>Показать опции командной строки Mercurial</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>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</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>Настроить</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>Настроить...</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>Показать диалог настроек с выбранной страницей настроек Mercurial</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>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -18302,437 +18302,437 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</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>Показать пути</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>Показать пути...</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>Алиасы для удалённых репозиториев</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>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</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>Проверить репозиторий</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>Проверить репозиторий...</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>Проверить целостность репозитория</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>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</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>Восстановить</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>Восстановить...</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>Восстановить после прерванной транзакции</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>Восстановить</b><p>Восстановить после прерванной транзакции.</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>Администрирование репозитория</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>Создать файл .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>Создать файл .hgignore со значениями по умолчанию</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>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</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>Создать группу изменений</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>Создать группу изменений...</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>Создать файл коллекции изменений</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>Применить группу изменений</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>Применить группу изменений...</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>Применить файл(ы) группы изменений</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>Менеджмент группы изменений</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>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (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>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (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>Показать текущую ветвь</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>Показать текущую ветвь проекта</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>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</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>Пометить как "хороший"</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>Пометить выбранные изменения как "хорошие"</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>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</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>Пометить как "плохой"</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>Пометить выбранные изменения как "плохие"</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>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</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>Пропустить</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>Пропустить текущие изменения</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>Пропустить</b><p>Пропустить текущие изменения.</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>Сбросить</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>Сбросить данные двоичного поиска</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>Сбросить</b><p>Сбросить данные двоичного поиска.</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>Двоичный поиск</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>Пометить как "хороший"...</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>Пометить как "плохой"...</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>Предпросмотр группы изменений</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>Предпросмотр группы изменений...</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>Идентифицировать</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>Идентифицировать...</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>Задайте каталог проекта</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>Каталог проекта</b><p>Задайте каталог проекта.</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>Предпросмотр файла содержащего коллекцию групп изменений</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>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</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>Выбрать группу изменений</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>Выбрать группу изменений...</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>Выбрать файл содержащий коллекцию групп изменений</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>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</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>Отмена изменений</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>Отмена предыдущих изменений</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>Отмена изменений</b><p>Отмена предыдущих изменений.</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>Послать изменения (принудительно)</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>Послать изменения в удалённый репозиторий (принудительно)</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>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</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>Специфический</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>Запустить сервер для репозитория проекта</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>Запустить сервер для репозитория проекта...</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>Запустить сервер для репозитория проекта</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>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</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>Загрузить</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>Необходимо перезагрузить проект. Сделать это?</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> @@ -19288,6 +19288,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">Задать ревизию порядковым номером</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Задайте номер ревизии</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">Задать ревизию идентификатором изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation type="unfinished">Задайте идентификатор изменений</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">Задать ревизию с помощью метки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished">Метка:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished">Введите имя метки</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">Задать ревизию с помощью имени ветви</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished">Ветвь:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished">Введите имя ветви</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">Головная ревизия репозитория</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="29"/> @@ -29466,22 +29644,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> @@ -29489,77 +29667,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> @@ -31496,177 +31674,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> @@ -31674,622 +31852,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">Необходимо перезагрузить проект. Сделать это?</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">Необходимо перезагрузить проект. Сделать это?</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"/> @@ -41238,13 +41502,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> @@ -41329,50 +41593,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">Продолжить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Продолжить</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">Необходимо перезагрузить проект. Сделать это?</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> @@ -48181,17 +48450,17 @@ <context> <name>mercurial</name> <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>Метки</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>Ветви</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> @@ -48202,30 +48471,30 @@ </table></p></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>Изменения</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>Предки</b></td><td>{0}</td></tr></translation> </message> <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>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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> @@ -48235,7 +48504,7 @@ </table></p></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> @@ -48252,7 +48521,7 @@ {2}</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_tr.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_tr.ts Tue May 31 16:35:45 2011 +0200 @@ -1378,62 +1378,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> @@ -1662,167 +1662,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">Yerimleri</translation> </message> @@ -11669,7 +11669,7 @@ <translation type="obsolete">Uzak Mercurial kaynak havuzundan çekiliyor</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> @@ -11677,27 +11677,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">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -12491,12 +12491,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> @@ -12504,57 +12504,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> @@ -15473,247 +15473,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Bilgi havuzu projesi oluştur</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 type="unfinished"></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>Mercurial kaynak havauzu oluşturuluyor</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Yenşden adlandırılıyor {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 type="unfinished"></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>Değişiklikler eski haline alınıyor</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>Birleştiriliyor</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 komut</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>Kopyalanıyor {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 Günlüğü</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>Gösterilecek giriş sayısını seçiniz.</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>Uzak Mercurial kaynak havuzundan çekiliyor</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 type="unfinished"></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 type="unfinished"></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>Sınıf(Branş) Oluştur</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>Sınıf(Branş) adını gir</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></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>Değişimgrubu oluştur</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 Değiştirme grubu Dosyaları (*.hg)</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>Değişimgrubu öngörünümü</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 Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -16616,12 +16616,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>İşlem Üretecinde Hata</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>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -17812,1022 +17812,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>Kaynak havuzundan yeni</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>Kay&nak havuzundan yeni...</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>Mercurial proje havuzundan yeni bir proje oluştur(klonla)</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 type="unfinished"></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>Giren günlük kaydını göster</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 type="unfinished"></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 type="unfinished"></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>Değişiklikleri çek</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>Değişiklileri uzak kaynak havuzundan çek</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>Değişiklikleri çek</b><p>Bu uzaktaki bir kaynak havuzundan yerel koynak havuzuna değişiklileri çeker.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> <source>Update from repository</source> <translation>Kaynak Havuzundan güncelle</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>Kaynak Hav&uzundan güncelle</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>Mercurial kaynak havuzundan yerel projeyi güncelle</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>Kaynak havuzundan güncelle</b><p>Bu güncelleme yerel projeyi Mercural kaunak havuzundan günceller.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>Commit changes to repository</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="149"/> <source>&Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak ha&vuzuna teslim et...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>değişiklikleri kabul et</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>Uzak kaynak havuzuna değişiklikleri gönder</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 type="unfinished"></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>Kaynak havuzundan ihraç et</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>Dışarı kaynak havuzundan ihraç &et...</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>Dışa Kaynak havuzundan proje aktar</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>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</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>K&aynak havuzuna ekle...</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 type="unfinished"></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 type="unfinished"></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>Kaynak havuzundan kaldır (ve diskten)</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>Kaynak havuzundan kaldı&r (ve diskten)</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 type="unfinished"></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 type="unfinished"></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>Kayıtı göster</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>Kayıtı &göster</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>Yerel projenin günlük kaydını göster</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 type="unfinished"></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>Sınırlı kayıtı göster</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 type="unfinished"></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 type="unfinished"></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>Kayıt gözatıcısını gösted</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 type="unfinished"></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 type="unfinished"></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>Farkları göster</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>Farkları gös&ter</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 type="unfinished"></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 type="unfinished"></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>Farkları göster (gelişmiş)</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 type="unfinished"></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 type="unfinished"></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>Durumu Göster</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>Durumu gö&ster</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Değişiklikleri başa döndür</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>Değişiklikleri ba&şa döndür</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 type="unfinished"></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 type="unfinished"></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>Birleştir</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>De&ğişiklikleri birleştir...</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 type="unfinished"></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 type="unfinished"></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>Çelişkileri çözümle</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>Çelişkileri çö&zümle</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 type="unfinished"></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 type="unfinished"></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>Kaynak havuzu etiketi</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>Kaynak havuzu e&tiketi...</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 type="unfinished"></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 type="unfinished"></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>Etiketleri listele</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>Etiketleri listele...</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 type="unfinished"></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 type="unfinished"></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>Branşlar listesi</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>Branşlar listesi...</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>Prosenin branşlar listesi</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>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Değiştirmek</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>Deği&ştirmek...</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 type="unfinished"></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 type="unfinished"></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>Temizle</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>Temi&zle</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>Yerel projeyi temizle</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>Temizle</b><p>Bu yerel projeyi sıfırlar.</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Komut seçenekleri</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>K&omut seçenekleri...</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 type="unfinished"></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 type="unfinished"></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>Yapılandırma</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>Ayarlanıyor...</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Değişimgrubu oluştur</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Değişimgrubu öngörünümü</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Atla</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 type="unfinished"></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 type="unfinished"></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>Başadön</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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>Çekmek</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>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</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> @@ -19383,6 +19383,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">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">Numara</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">Gözden geçirme numarası gir</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"></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">Değişiklik set kimliğini gir</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation type="unfinished"></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"/> @@ -29692,22 +29870,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> @@ -29715,77 +29893,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> @@ -31693,177 +31871,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> @@ -31871,622 +32049,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">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</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">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</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"/> @@ -41355,13 +41619,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> @@ -41446,50 +41710,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">Devam et</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">Devam et</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">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</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> @@ -48294,24 +48563,24 @@ <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>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="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>Etiketler</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>Branşlar</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> @@ -48320,7 +48589,7 @@ <tr><td><b>Teslim zamnanı</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> @@ -48337,23 +48606,23 @@ {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>İp ucu</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>DEğişiklik seti</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>Esas</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> @@ -48364,7 +48633,7 @@ </table></p></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_zh_CN.GB2312.ts Tue May 31 16:15:55 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue May 31 16:35:45 2011 +0200 @@ -1557,62 +1557,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> @@ -1844,167 +1844,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">书签</translation> </message> @@ -12505,7 +12505,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 type="unfinished"></translation> </message> @@ -12513,27 +12513,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"></translation> </message> @@ -13362,12 +13362,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> @@ -13375,57 +13375,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> @@ -16651,247 +16651,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">还原改变</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">选择要显示的条目数。</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -17794,12 +17794,12 @@ <translation type="unfinished">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 type="unfinished">进程生成错误</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 type="unfinished"></translation> </message> @@ -19010,1022 +19010,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 type="unfinished">从储存库新建</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 type="unfinished">从储存库新建(&N)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">从储存库更新</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 type="unfinished">从储存库更新(&U)</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">将更改提交到储存库中</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 type="unfinished">将更改提交到储存库中(&C)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">从储存库导出</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 type="unfinished">从储存库导出(&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 type="unfinished">从储存库中导出一个项目</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 type="unfinished"><b>从储存库导出</b><p>从储存库导出一个项目。</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 type="unfinished">添加到储存库</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 type="unfinished">添加到储存库（&A）……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">从储存库（和磁盘）中移除</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 type="unfinished">从储存库（和磁盘）中移除(&R)</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">显示日志</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 type="unfinished">显示日志(&l)</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 type="unfinished">显示本地项目的日志</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 type="unfinished"><b>显示日志</b><p>显示本地项目的日志。</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 type="unfinished">显示受限日志</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 type="unfinished">显示本地项目的受限日志</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 type="unfinished"><b>显示受限日志</b><p>显示本地项目限制到条目的一个可选号上的日志。</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 type="unfinished">显示日志浏览器</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 type="unfinished">显示对话框以浏览本地项目的日志</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 type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</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 type="unfinished">显示差异</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 type="unfinished">显示差异(&d)</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 type="unfinished">显示本地项目与储存库的差异</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 type="unfinished"><b>显示差异</b><p>显示本地项目与储存库的差异。</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 type="unfinished">显示差异（扩展）</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 type="unfinished">显示项目的修订本与储存库的差异</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 type="unfinished"><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</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 type="unfinished">显示状态</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 type="unfinished">显示状态(&s)</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 type="unfinished">显示本地项目的状态</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 type="unfinished"><b>显示状态</b><p>显示本地项目的状态。</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">还原改变</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 type="unfinished">还原改变(&v)</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 type="unfinished">还原所有改变到本地项目中</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 type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</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 type="unfinished">合并</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 type="unfinished">合并更改(&g)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">解析冲突</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 type="unfinished">解析冲突(&f)</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 type="unfinished">解析本地项目的所有冲突</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 type="unfinished"><b>解析冲突</b><p>解析本地项目的所有冲突。</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 type="unfinished">在储存库中标记</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 type="unfinished">在储存库中标记(&T)……</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 type="unfinished">在储存库中标记本地项目</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 type="unfinished"><b>在储存库中标记</b><p>在储存库中标记本地项目。</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 type="unfinished">列出标签</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 type="unfinished">列出标签……</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 type="unfinished">列出项目的标签</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 type="unfinished"><b>列出标签</b><p>列出项目的标签。</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 type="unfinished">列出分支</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 type="unfinished">列出分支……</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 type="unfinished">列出项目的分支</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 type="unfinished"><b>列出分支</b><p>列出项目的分支。</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">转换</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 type="unfinished">转换(&w)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">清除</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 type="unfinished">清除(&p)</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 type="unfinished">清除本地项目</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 type="unfinished"><b>清除</b><p>执行对本地项目的清除。</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 type="unfinished">执行命令</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 type="unfinished">执行命令(&x)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">命令选项</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 type="unfinished">命令选项(&o)……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">配置</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 type="unfinished">配置……</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished">跳过</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 type="unfinished"></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 type="unfinished"></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 type="unfinished">重置</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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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="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="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="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1038"/> <source>Pull</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>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> <source>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> @@ -20581,6 +20581,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">选择通过号码指定一个修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="225"/> + <source>Number</source> + <translation type="unfinished">号码</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="235"/> + <source>Enter a revision number</source> + <translation type="unfinished">输入一个修订号</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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="267"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="277"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="287"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="297"/> + <source>Enter a tag name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="310"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="320"/> + <source>Enter a branch name</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="362"/> + <source>TIP</source> + <translation type="unfinished"></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"/> @@ -31969,22 +32147,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> @@ -31992,77 +32170,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> @@ -34202,177 +34380,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> @@ -34380,622 +34558,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"></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"></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>ReplaceDialog</name> <message> <location filename="QScintilla/Ui_ReplaceDialog.py" line="152"/> @@ -44906,13 +45170,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> @@ -44997,50 +45261,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">继续</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="71"/> + <translation type="obsolete">继续</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"></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> @@ -52567,30 +52836,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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -52601,23 +52870,23 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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> @@ -52625,7 +52894,7 @@ <translation type="unfinished"></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>
