Mercurial Repositories > eric / changeset
changeset
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
Sat, 11 Feb 2012 14:54:14 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 11 Feb 2012 14:54:14 +0100
- changeset 1608
- b6390d242303
- parent 1607
- 67c7ffaed401
- child 1609
- b7717f065282
Added capability to change the phase of changesets to the project VCS menu and the Mercurial log-browser.
--- a/APIs/Python3/eric5.api Fri Feb 10 19:33:45 2012 +0100 +++ b/APIs/Python3/eric5.api Sat Feb 11 14:54:14 2012 +0100 @@ -3478,6 +3478,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.DateColumn?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.IconColumn?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.MessageColumn?7 +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.PhaseColumn?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.RevisionColumn?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.TagsColumn?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.closeEvent?4(e) @@ -3496,6 +3497,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_logTree_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_nextButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_passwordCheckBox_toggled?4(isOn) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_phaseButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_refreshButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_rxEdit_textChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() @@ -3538,6 +3540,10 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog?1(vcs, project, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.HgPhaseDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.HgPhaseDialog.on_phaseCombo_activated?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.HgPhaseDialog.on_revisionsEdit_textChanged?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.HgPhaseDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -3796,6 +3802,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogBrowser?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(name, data=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False)
--- a/APIs/Python3/eric5.bas Fri Feb 10 19:33:45 2012 +0100 +++ b/APIs/Python3/eric5.bas Sat Feb 11 14:54:14 2012 +0100 @@ -258,6 +258,7 @@ HgMultiRevisionSelectionDialog QDialog Ui_HgMultiRevisionSelectionDialog HgNewProjectOptionsDialog QDialog Ui_HgNewProjectOptionsDialog HgOptionsDialog QDialog Ui_HgOptionsDialog +HgPhaseDialog QDialog Ui_HgPhaseDialog HgProjectBrowserHelper VcsProjectBrowserHelper HgProjectHelper VcsProjectHelper HgPurgeListDialog QDialog Ui_HgPurgeListDialog
--- a/Documentation/Help/source.qhp Fri Feb 10 19:33:45 2012 +0100 +++ b/Documentation/Help/source.qhp Sat Feb 11 14:54:14 2012 +0100 @@ -445,6 +445,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html" /> @@ -4646,6 +4647,7 @@ <keyword name="Hg.hgLogBrowser" id="Hg.hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgLogBrowser" /> <keyword name="Hg.hgNormalizeURL" id="Hg.hgNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgNormalizeURL" /> <keyword name="Hg.hgOutgoing" id="Hg.hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgOutgoing" /> + <keyword name="Hg.hgPhase" id="Hg.hgPhase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPhase" /> <keyword name="Hg.hgPreviewBundle" id="Hg.hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPreviewBundle" /> <keyword name="Hg.hgPull" id="Hg.hgPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPull" /> <keyword name="Hg.hgPush" id="Hg.hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPush" /> @@ -4974,6 +4976,8 @@ <keyword name="HgLogBrowserDialog.__resortFiles" id="HgLogBrowserDialog.__resortFiles" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resortFiles" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__updateDiffButtons" id="HgLogBrowserDialog.__updateDiffButtons" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateDiffButtons" /> + <keyword name="HgLogBrowserDialog.__updateGui" id="HgLogBrowserDialog.__updateGui" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updateGui" /> + <keyword name="HgLogBrowserDialog.__updatePhaseButton" id="HgLogBrowserDialog.__updatePhaseButton" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__updatePhaseButton" /> <keyword name="HgLogBrowserDialog.closeEvent" id="HgLogBrowserDialog.closeEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.closeEvent" /> <keyword name="HgLogBrowserDialog.col2x" id="HgLogBrowserDialog.col2x" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.col2x" /> <keyword name="HgLogBrowserDialog.keyPressEvent" id="HgLogBrowserDialog.keyPressEvent" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.keyPressEvent" /> @@ -4990,6 +4994,7 @@ <keyword name="HgLogBrowserDialog.on_logTree_itemSelectionChanged" id="HgLogBrowserDialog.on_logTree_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_logTree_itemSelectionChanged" /> <keyword name="HgLogBrowserDialog.on_nextButton_clicked" id="HgLogBrowserDialog.on_nextButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_nextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_passwordCheckBox_toggled" id="HgLogBrowserDialog.on_passwordCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_passwordCheckBox_toggled" /> + <keyword name="HgLogBrowserDialog.on_phaseButton_clicked" id="HgLogBrowserDialog.on_phaseButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_phaseButton_clicked" /> <keyword name="HgLogBrowserDialog.on_refreshButton_clicked" id="HgLogBrowserDialog.on_refreshButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_refreshButton_clicked" /> <keyword name="HgLogBrowserDialog.on_rxEdit_textChanged" id="HgLogBrowserDialog.on_rxEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_rxEdit_textChanged" /> <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> @@ -5051,6 +5056,13 @@ <keyword name="HgOptionsDialog (Constructor)" id="HgOptionsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog.__init__" /> <keyword name="HgOptionsDialog (Module)" id="HgOptionsDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <keyword name="HgOptionsDialog.getData" id="HgOptionsDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog.getData" /> + <keyword name="HgPhaseDialog" id="HgPhaseDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog" /> + <keyword name="HgPhaseDialog (Constructor)" id="HgPhaseDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog.__init__" /> + <keyword name="HgPhaseDialog (Module)" id="HgPhaseDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> + <keyword name="HgPhaseDialog.__updateOk" id="HgPhaseDialog.__updateOk" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog.__updateOk" /> + <keyword name="HgPhaseDialog.getData" id="HgPhaseDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog.getData" /> + <keyword name="HgPhaseDialog.on_phaseCombo_activated" id="HgPhaseDialog.on_phaseCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog.on_phaseCombo_activated" /> + <keyword name="HgPhaseDialog.on_revisionsEdit_textChanged" id="HgPhaseDialog.on_revisionsEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html#HgPhaseDialog.on_revisionsEdit_textChanged" /> <keyword name="HgProjectBrowserHelper" id="HgProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper" /> <keyword name="HgProjectBrowserHelper (Constructor)" id="HgProjectBrowserHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__init__" /> <keyword name="HgProjectBrowserHelper.__HgAnnotate" id="HgProjectBrowserHelper.__HgAnnotate" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgAnnotate" /> @@ -5095,6 +5107,7 @@ <keyword name="HgProjectHelper.__hgLogBrowser" id="HgProjectHelper.__hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogBrowser" /> <keyword name="HgProjectHelper.__hgOutgoing" id="HgProjectHelper.__hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgOutgoing" /> <keyword name="HgProjectHelper.__hgParents" id="HgProjectHelper.__hgParents" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgParents" /> + <keyword name="HgProjectHelper.__hgPhase" id="HgProjectHelper.__hgPhase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPhase" /> <keyword name="HgProjectHelper.__hgPreviewBundle" id="HgProjectHelper.__hgPreviewBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPreviewBundle" /> <keyword name="HgProjectHelper.__hgPull" id="HgProjectHelper.__hgPull" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPull" /> <keyword name="HgProjectHelper.__hgPush" id="HgProjectHelper.__hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPush" /> @@ -11616,6 +11629,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Feb 10 19:33:45 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat Feb 11 14:54:14 2012 +0100 @@ -49,7 +49,7 @@ QDialog, Ui_HgLogBrowserDialog <h3>Class Attributes</h3> <table> -<tr><td>AuthorColumn</td></tr><tr><td>BranchColumn</td></tr><tr><td>DateColumn</td></tr><tr><td>IconColumn</td></tr><tr><td>MessageColumn</td></tr><tr><td>RevisionColumn</td></tr><tr><td>TagsColumn</td></tr> +<tr><td>AuthorColumn</td></tr><tr><td>BranchColumn</td></tr><tr><td>DateColumn</td></tr><tr><td>IconColumn</td></tr><tr><td>MessageColumn</td></tr><tr><td>PhaseColumn</td></tr><tr><td>RevisionColumn</td></tr><tr><td>TagsColumn</td></tr> </table> <h3>Class Methods</h3> <table> @@ -130,6 +130,12 @@ <td><a href="#HgLogBrowserDialog.__updateDiffButtons">__updateDiffButtons</a></td> <td>Private slot to update the enabled status of the diff buttons.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__updateGui">__updateGui</a></td> +<td>Private slot to update GUI elements except the diff and phase buttons.</td> +</tr><tr> +<td><a href="#HgLogBrowserDialog.__updatePhaseButton">__updatePhaseButton</a></td> +<td>Private slot to update the status of the phase button.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.closeEvent">closeEvent</a></td> <td>Private slot implementing a close event handler.</td> </tr><tr> @@ -178,6 +184,9 @@ <td><a href="#HgLogBrowserDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> <td>Private slot to handle the password checkbox toggled.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_phaseButton_clicked">on_phaseButton_clicked</a></td> +<td>Private slot to handle the Change Phase button.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> <td>Private slot to refresh the log.</td> </tr><tr> @@ -341,7 +350,7 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__generateLogItem" ID="HgLogBrowserDialog.__generateLogItem"></a> <h4>HgLogBrowserDialog.__generateLogItem</h4> -<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, bookmarks=None</i>) +<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, phase, bookmarks=None</i>) <p> Private method to generate a log tree entry. </p><dl> @@ -498,6 +507,21 @@ <b>__updateDiffButtons</b>(<i></i>) <p> Private slot to update the enabled status of the diff buttons. +</p><a NAME="HgLogBrowserDialog.__updateGui" ID="HgLogBrowserDialog.__updateGui"></a> +<h4>HgLogBrowserDialog.__updateGui</h4> +<b>__updateGui</b>(<i>itm</i>) +<p> + Private slot to update GUI elements except the diff and phase buttons. +</p><dl> +<dt><i>itm</i></dt> +<dd> +reference to the item the update should be based on (QTreeWidgetItem) +</dd> +</dl><a NAME="HgLogBrowserDialog.__updatePhaseButton" ID="HgLogBrowserDialog.__updatePhaseButton"></a> +<h4>HgLogBrowserDialog.__updatePhaseButton</h4> +<b>__updatePhaseButton</b>(<i></i>) +<p> + Private slot to update the status of the phase button. </p><a NAME="HgLogBrowserDialog.closeEvent" ID="HgLogBrowserDialog.closeEvent"></a> <h4>HgLogBrowserDialog.closeEvent</h4> <b>closeEvent</b>(<i>e</i>) @@ -629,7 +653,12 @@ <dd> flag indicating the status of the check box (boolean) </dd> -</dl><a NAME="HgLogBrowserDialog.on_refreshButton_clicked" ID="HgLogBrowserDialog.on_refreshButton_clicked"></a> +</dl><a NAME="HgLogBrowserDialog.on_phaseButton_clicked" ID="HgLogBrowserDialog.on_phaseButton_clicked"></a> +<h4>HgLogBrowserDialog.on_phaseButton_clicked</h4> +<b>on_phaseButton_clicked</b>(<i></i>) +<p> + Private slot to handle the Change Phase button. +</p><a NAME="HgLogBrowserDialog.on_refreshButton_clicked" ID="HgLogBrowserDialog.on_refreshButton_clicked"></a> <h4>HgLogBrowserDialog.on_refreshButton_clicked</h4> <b>on_refreshButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Feb 10 19:33:45 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sat Feb 11 14:54:14 2012 +0100 @@ -130,6 +130,9 @@ <td><a href="#HgProjectHelper.__hgParents">__hgParents</a></td> <td>Private slot used to show the parents of the repository.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgPhase">__hgPhase</a></td> +<td>Private slot used to change the phase of revisions.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgPreviewBundle">__hgPreviewBundle</a></td> <td>Private slot used to preview a changegroup file.</td> </tr><tr> @@ -338,6 +341,11 @@ <b>__hgParents</b>(<i></i>) <p> Private slot used to show the parents of the repository. +</p><a NAME="HgProjectHelper.__hgPhase" ID="HgProjectHelper.__hgPhase"></a> +<h4>HgProjectHelper.__hgPhase</h4> +<b>__hgPhase</b>(<i></i>) +<p> + Private slot used to change the phase of revisions. </p><a NAME="HgProjectHelper.__hgPreviewBundle" ID="HgProjectHelper.__hgPreviewBundle"></a> <h4>HgProjectHelper.__hgPreviewBundle</h4> <b>__hgPreviewBundle</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Feb 10 19:33:45 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Feb 11 14:54:14 2012 +0100 @@ -170,6 +170,9 @@ <td><a href="#Hg.hgOutgoing">hgOutgoing</a></td> <td>Public method used to view the log of outgoing changes from the Mercurial repository.</td> </tr><tr> +<td><a href="#Hg.hgPhase">hgPhase</a></td> +<td>Public method to change the phase of revisions.</td> +</tr><tr> <td><a href="#Hg.hgPreviewBundle">hgPreviewBundle</a></td> <td>Public method used to view the log of incoming changes from a changegroup file.</td> </tr><tr> @@ -712,6 +715,25 @@ <dd> file/directory name to show the log of (string) </dd> +</dl><a NAME="Hg.hgPhase" ID="Hg.hgPhase"></a> +<h4>Hg.hgPhase</h4> +<b>hgPhase</b>(<i>name, data=None</i>) +<p> + Public method to change the phase of revisions. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the project to export from (string) +</dd><dt><i>data</i></dt> +<dd> +tuple giving phase data (list of revisions, phase, flag + indicating a forced operation) (list of strings, string, boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success (boolean) +</dd> </dl><a NAME="Hg.hgPreviewBundle" ID="Hg.hgPreviewBundle"></a> <h4>Hg.hgPreviewBundle</h4> <b>hgPreviewBundle</b>(<i>name</i>)
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri Feb 10 19:33:45 2012 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sat Feb 11 14:54:14 2012 +0100 @@ -123,6 +123,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html">HgOptionsDialog</a></td> <td>Module implementing a dialog to enter options used to start a project in the VCS.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html">HgPhaseDialog</a></td> +<td>Module implementing a dialog to enter data for the Mercurial Phase operation.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html">HgRevisionSelectionDialog</a></td> <td>Module implementing a dialog to select a revision.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Feb 10 19:33:45 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Feb 11 14:54:14 2012 +0100 @@ -133,6 +133,8 @@ self.trUtf8("Bookmarks")) if self.vcs.version < (2, 1): self.logTree.setColumnHidden(self.PhaseColumn, True) + self.phaseLine.hide() + self.phaseButton.hide() def __initData(self): """ @@ -985,6 +987,52 @@ self.diffRevisionsButton.setEnabled(False) + def __updatePhaseButton(self): + """ + Private slot to update the status of the phase button. + """ + # step 1: count entries with changeable phases + secret = 0 + draft = 0 + public = 0 + for itm in self.logTree.selectedItems(): + phase = itm.text(self.PhaseColumn) + if phase == "draft": + draft += 1 + elif phase == "secret": + secret += 1 + else: + public += 1 + + # step 2: set the status of the phase button + if public == 0 and \ + ((secret > 0 and draft == 0) or \ + (secret == 0 and draft > 0)): + self.phaseButton.setEnabled(True) + else: + self.phaseButton.setEnabled(False) + + def __updateGui(self, itm): + """ + Private slot to update GUI elements except the diff and phase buttons. + + @param itm reference to the item the update should be based on (QTreeWidgetItem) + """ + self.messageEdit.clear() + self.filesTree.clear() + + if itm is not None: + for line in itm.data(0, self.__messageRole): + self.messageEdit.append(line.strip()) + + changes = itm.data(0, self.__changesRole) + if len(changes) > 0: + for change in changes: + self.__generateFileItem( + change["action"], change["path"], change["copyfrom"]) + self.__resizeColumnsFiles() + self.__resortFiles() + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) def on_logTree_currentItemChanged(self, current, previous): """ @@ -993,22 +1041,9 @@ @param current reference to the new current item (QTreeWidgetItem) @param previous reference to the old current item (QTreeWidgetItem) """ - self.messageEdit.clear() - self.filesTree.clear() - - if current is not None: - for line in current.data(0, self.__messageRole): - self.messageEdit.append(line.strip()) - - changes = current.data(0, self.__changesRole) - if len(changes) > 0: - for change in changes: - self.__generateFileItem( - change["action"], change["path"], change["copyfrom"]) - self.__resizeColumnsFiles() - self.__resortFiles() - + self.__updateGui(current) self.__updateDiffButtons() + self.__updatePhaseButton() @pyqtSlot() def on_logTree_itemSelectionChanged(self): @@ -1016,9 +1051,10 @@ Private slot called, when the selection has changed. """ if len(self.logTree.selectedItems()) == 1: - self.logTree.setCurrentItem(self.logTree.selectedItems()[0]) + self.__updateGui(self.logTree.selectedItems()[0]) self.__updateDiffButtons() + self.__updatePhaseButton() @pyqtSlot() def on_nextButton_clicked(self): @@ -1033,7 +1069,7 @@ """ Private slot to handle the Diff to Parent 1 button. """ - itm = self.logTree.currentItem() + itm = self.logTree.selectedItems()[0] if itm is None: self.diffP1Button.setEnabled(False) return @@ -1051,7 +1087,7 @@ """ Private slot to handle the Diff to Parent 2 button. """ - itm = self.logTree.currentItem() + itm = self.logTree.selectedItems()[0] if itm is None: self.diffP2Button.setEnabled(False) return @@ -1250,3 +1286,29 @@ evt.accept() return super().keyPressEvent(evt) + + @pyqtSlot() + def on_phaseButton_clicked(self): + """ + Private slot to handle the Change Phase button. + """ + currentPhase = self.logTree.selectedItems()[0].text(self.PhaseColumn) + revs = [] + for itm in self.logTree.selectedItems(): + if itm.text(self.PhaseColumn) == currentPhase: + revs.append(itm.text(self.RevisionColumn).split(":")[0].strip()) + + if not revs: + self.phaseButton.setEnabled(False) + return + + if currentPhase == "draft": + newPhase = "secret" + data = (revs, "s", True) + else: + newPhase = "draft" + data = (revs, "d", False) + res = self.vcs.hgPhase(self.repodir, data) + if res: + for itm in self.logTree.selectedItems(): + itm.setText(self.PhaseColumn, newPhase)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Fri Feb 10 19:33:45 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sat Feb 11 14:54:14 2012 +0100 @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>800</width> + <width>1000</width> <height>800</height> </rect> </property> @@ -279,7 +279,7 @@ <number>10000</number> </property> <property name="value"> - <number>100</number> + <number>20</number> </property> </widget> </item> @@ -337,6 +337,33 @@ </widget> </item> <item> + <widget class="Line" name="phaseLine"> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="phaseButton"> + <property name="toolTip"> + <string>Change the phase of the selected revisions</string> + </property> + <property name="whatsThis"> + <string><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></string> + </property> + <property name="text"> + <string>Change Phase</string> + </property> + </widget> + </item> + <item> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -468,6 +495,7 @@ <tabstop>diffP1Button</tabstop> <tabstop>diffP2Button</tabstop> <tabstop>diffRevisionsButton</tabstop> + <tabstop>phaseButton</tabstop> <tabstop>input</tabstop> <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Sat Feb 11 14:54:14 2012 +0100 @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for the Mercurial Phase operation. +""" + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgPhaseDialog import Ui_HgPhaseDialog + + +class HgPhaseDialog(QDialog, Ui_HgPhaseDialog): + """ + Class dimplementing a dialog to enter data for the Mercurial Phase operation. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.phaseCombo.addItem("", "") + self.phaseCombo.addItem(self.trUtf8("Public"), "p") + self.phaseCombo.addItem(self.trUtf8("Draft"), "d") + self.phaseCombo.addItem(self.trUtf8("Secret"), "s") + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + def __updateOk(self): + """ + Private slot to update the state of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + self.revisionsEdit.toPlainText().strip() != "" and + self.phaseCombo.currentText().strip() != "") + + @pyqtSlot() + def on_revisionsEdit_textChanged(self): + """ + Private slot to react upon changes of revisions. + """ + self.__updateOk() + + @pyqtSlot(str) + def on_phaseCombo_activated(self, txt): + """ + Private slot to react upon changes of the phase. + """ + self.__updateOk() + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple with list of revisions, phase and a flag indicating + a forced operation (list of strings, string, boolean) + """ + return ( + self.revisionsEdit.toPlainText().strip().splitlines(), + self.phaseCombo.itemData(self.phaseCombo.currentIndex()), + self.forceCheckBox.isChecked() + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui Sat Feb 11 14:54:14 2012 +0100 @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgPhaseDialog</class> + <widget class="QDialog" name="HgPhaseDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>186</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Phases</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>&Revisions:</string> + </property> + <property name="buddy"> + <cstring>revisionsEdit</cstring> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPlainTextEdit" name="revisionsEdit"> + <property name="toolTip"> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Phase:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="phaseCombo"> + <property name="toolTip"> + <string>Select the phase to be set for the specified revisions</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to force the phase change</string> + </property> + <property name="text"> + <string>Force Phase Change</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>revisionsEdit</tabstop> + <tabstop>phaseCombo</tabstop> + <tabstop>forceCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgPhaseDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgPhaseDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Feb 10 19:33:45 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Feb 11 14:54:14 2012 +0100 @@ -838,7 +838,7 @@ self.hgExportAct = E5Action(self.trUtf8('Export Patches'), self.trUtf8('Export Patches...'), - 0, 0, self, 'mercurial_import') + 0, 0, self, 'mercurial_export') self.hgExportAct.setStatusTip(self.trUtf8( 'Export revisions to patch files' )) @@ -848,6 +848,19 @@ )) self.hgExportAct.triggered[()].connect(self.__hgExport) self.actions.append(self.hgExportAct) + + self.hgPhaseAct = E5Action(self.trUtf8('Change Phase'), + self.trUtf8('Change Phase...'), + 0, 0, self, 'mercurial_change_phase') + self.hgPhaseAct.setStatusTip(self.trUtf8( + 'Change the phase of revisions' + )) + self.hgPhaseAct.setWhatsThis(self.trUtf8( + """<b>Change Phase</b>""" + """<p>This changes the phase of revisions.</p>""" + )) + self.hgPhaseAct.triggered[()].connect(self.__hgPhase) + self.actions.append(self.hgPhaseAct) def initMenu(self, menu): """ @@ -965,6 +978,9 @@ menu.addAction(self.vcsDiffAct) menu.addAction(self.hgExtDiffAct) menu.addSeparator() + if self.vcs.version >= (2, 1): + menu.addAction(self.hgPhaseAct) + menu.addSeparator() menu.addAction(self.vcsRevertAct) menu.addAction(self.vcsMergeAct) menu.addAction(self.vcsResolveAct) @@ -1288,3 +1304,10 @@ yesDefault=True) if res: self.project.reopenProject() + + def __hgPhase(self): + """ + Private slot used to change the phase of revisions. + """ + self.vcs.hgPhase(self.project.ppath) +
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Feb 10 19:33:45 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Feb 11 14:54:14 2012 +0100 @@ -50,6 +50,7 @@ from .HgClient import HgClient from .HgImportDialog import HgImportDialog from .HgExportDialog import HgExportDialog +from .HgPhaseDialog import HgPhaseDialog from .BookmarksExtension.bookmarks import Bookmarks from .QueuesExtension.queues import Queues @@ -2473,6 +2474,57 @@ if res: dia.exec_() + def hgPhase(self, name, data=None): + """ + Public method to change the phase of revisions. + + @param name directory name of the project to export from (string) + @param data tuple giving phase data (list of revisions, phase, flag + indicating a forced operation) (list of strings, string, boolean) + @return flag indicating success (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return False + + if data is None: + dlg = HgPhaseDialog() + if dlg.exec_() == QDialog.Accepted: + data = dlg.getData() + + if data: + revs, phase, force = data + + args = [] + args.append("phase") + if phase == "p": + args.append("--public") + elif phase == "d": + args.append("--draft") + elif phase == "s": + args.append("--secret") + else: + raise ValueError("Invalid phase given.") + if force: + args.append("--force") + for rev in revs: + args.append(rev) + + dia = HgDialog(self.trUtf8("Change Phase"), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.normalExitWithoutErrors() + else: + res = False + + return res + ############################################################################ ## Methods to handle extensions are below. ############################################################################
--- a/eric5.e4p Fri Feb 10 19:33:45 2012 +0100 +++ b/eric5.e4p Sat Feb 11 14:54:14 2012 +0100 @@ -941,6 +941,7 @@ <Source>Helpviewer/UserAgent/UserAgentsDialog.py</Source> <Source>Helpviewer/UserAgent/UserAgentModel.py</Source> <Source>Helpviewer/UserAgent/UserAgentManager.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1213,6 +1214,7 @@ <Form>Helpviewer/SiteInfo/SiteInfoDialog.ui</Form> <Form>Helpviewer/SslInfoWidget.ui</Form> <Form>Helpviewer/UserAgent/UserAgentsDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_cs.ts Sat Feb 11 14:54:14 2012 +0100 @@ -16203,42 +16203,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -16248,47 +16248,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <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="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <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="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <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="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -16303,112 +16303,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <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="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <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="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <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="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <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="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <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="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <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="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -16418,70 +16418,75 @@ <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="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <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="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <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="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18089,12 +18094,12 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Autor</translation> </message> @@ -18174,52 +18179,52 @@ <translation>&Porovnat revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Chyby</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Vstup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Stisknutím odeslat vstup do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>Ode&slat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Zadejte data, která se odešlou do hg procesu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>Mód vstu&pu hesla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation></translation> </message> @@ -18239,27 +18244,27 @@ <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation>Hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -18338,6 +18343,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18830,6 +18851,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19630,7 +19704,7 @@ <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -19665,7 +19739,7 @@ <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -19680,7 +19754,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -19770,7 +19844,7 @@ <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19895,17 +19969,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -19940,7 +20014,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20020,7 +20094,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20040,12 +20114,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -20069,6 +20143,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51208,30 +51302,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51242,23 +51336,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="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -51266,7 +51360,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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_de.ts Sat Feb 11 14:54:14 2012 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12866,7 +12865,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="837"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15599,11 +15598,6 @@ <translation>Zeichenkodierung</translation> </message> <message> - <location filename="Helpviewer/HelpWindow.py" line="1301"/> - <source>User Agent</source> - <translation type="obsolete">User Agent</translation> - </message> - <message> <location filename="Helpviewer/HelpWindow.py" line="2717"/> <source>ISO</source> <translation>ISO</translation> @@ -15838,265 +15832,270 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <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="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <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="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <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="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <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="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <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="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <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="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <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="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <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="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <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="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <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="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <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="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <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="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <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="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17691,12 +17690,12 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Autor</translation> </message> @@ -17766,52 +17765,52 @@ <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial Log Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log Befehls.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg Prozess zu senden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Gib die Daten ein, die an den hg Prozess geschickt werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwort Modus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Kennwort Modus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -17831,27 +17830,27 @@ <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -17935,6 +17934,22 @@ <source>Phase</source> <translation>Phase</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation>Ändert die Phase der ausgewählten Revisionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18442,6 +18457,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation>Mercurial Phasen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation>&Revisionen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation>Phase:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation>Wähle die Phase, in die die angegebenen Revisionen überführt werden sollen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation>Auswählen, um den Phasenwechsel zu erzwingen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation>Phasenwechsel erzwingen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation>Öffentlich</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation>Entwurf</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation>Geheim</translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19182,7 +19250,7 @@ <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -19217,7 +19285,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> @@ -19232,7 +19300,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -19312,7 +19380,7 @@ <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19417,7 +19485,7 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option 'force' hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> @@ -19442,12 +19510,12 @@ <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -19482,7 +19550,7 @@ <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -19562,7 +19630,7 @@ <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -19582,12 +19650,12 @@ <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> @@ -19611,6 +19679,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -43857,11 +43945,6 @@ </message> <message> <location filename="Helpviewer/UserAgent/UserAgentModel.py" line="31"/> - <source>Useragent String</source> - <translation type="obsolete">Useragent Zeichenkette</translation> - </message> - <message> - <location filename="Helpviewer/UserAgent/UserAgentModel.py" line="31"/> <source>User Agent String</source> <translation>User Agent Zeichenkette</translation> </message> @@ -50139,24 +50222,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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> @@ -50165,7 +50248,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50182,24 +50265,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -50210,7 +50293,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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 Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_en.ts Sat Feb 11 14:54:14 2012 +0100 @@ -15745,265 +15745,270 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17584,12 +17589,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -17694,52 +17699,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> @@ -17764,27 +17769,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17818,6 +17823,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18308,6 +18329,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19173,7 +19247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19288,32 +19362,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -19348,7 +19422,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19428,7 +19502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19448,12 +19522,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -19477,6 +19551,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -49677,30 +49771,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49711,23 +49805,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -49735,7 +49829,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_es.ts Sat Feb 11 14:54:14 2012 +0100 @@ -16039,42 +16039,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <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="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> @@ -16084,32 +16084,32 @@ <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <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="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <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="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -16124,195 +16124,200 @@ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <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="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <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="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <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="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <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="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <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="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <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="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <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="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <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="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17937,12 +17942,12 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Autor</translation> </message> @@ -18012,52 +18017,52 @@ <translation>&Comparar Revisiones</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Errores de Mercurial log</b><p>Muestra los posibles mensajes de error del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Pulsar para enviar el input al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>&Enviar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Introduzca los datos a enviar al proceso de hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Seleccionar para cambiar el campo de input a modo contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Modo de contraseña</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18077,12 +18082,12 @@ <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <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> @@ -18097,17 +18102,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <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/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <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/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -18181,6 +18186,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18688,6 +18709,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished">&Revisiones:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished">Introducir changesets por número, id, rango o expresión de revset, uno por línea</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19503,7 +19577,7 @@ <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> @@ -19523,7 +19597,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> @@ -19538,7 +19612,7 @@ <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -19628,7 +19702,7 @@ <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19733,7 +19807,7 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation>Especial</translation> </message> @@ -19758,12 +19832,12 @@ <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -19798,7 +19872,7 @@ <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -19878,7 +19952,7 @@ <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> @@ -19898,12 +19972,12 @@ <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> @@ -19927,6 +20001,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50864,17 +50958,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -50885,31 +50979,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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> @@ -50918,7 +51012,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50935,7 +51029,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_fr.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_fr.ts Sat Feb 11 14:54:14 2012 +0100 @@ -17345,87 +17345,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -17435,180 +17435,185 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -19198,12 +19203,12 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> @@ -19298,52 +19303,52 @@ <translation type="unfinished">&Comparer des versions</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation type="unfinished">Erreurs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished">Entrée</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation type="unfinished">&Envoyer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -19363,27 +19368,27 @@ <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -19462,6 +19467,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -19963,6 +19984,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -20723,7 +20797,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -20758,7 +20832,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -20773,7 +20847,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20853,7 +20927,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20958,7 +21032,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20983,12 +21057,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21023,7 +21097,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -21103,7 +21177,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -21123,12 +21197,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -21152,6 +21226,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -55150,30 +55244,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -55184,23 +55278,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -55208,7 +55302,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_it.ts Sat Feb 11 14:54:14 2012 +0100 @@ -15969,42 +15969,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <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="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -16014,47 +16014,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <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="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <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="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -16069,180 +16069,185 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <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="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <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="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <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="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <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="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <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="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <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="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <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="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17850,12 +17855,12 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Autore</translation> </message> @@ -17935,52 +17940,52 @@ <translation>&Confronta revisioni</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Premi per spedire l'input al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>&Spedisci</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Inserisci i dati da inviare al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Seleziona per impostare il campo di input in modalità password</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>Modo &Password</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18000,27 +18005,27 @@ <translation>Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <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/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -18094,6 +18099,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18600,6 +18621,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19400,7 +19474,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -19435,7 +19509,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -19450,7 +19524,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -19540,7 +19614,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19665,17 +19739,17 @@ <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -19710,7 +19784,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19790,7 +19864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19810,12 +19884,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -19839,6 +19913,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50700,24 +50794,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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> @@ -50726,7 +50820,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50743,24 +50837,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -50770,7 +50864,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_ru.ts Sat Feb 11 14:54:14 2012 +0100 @@ -16071,42 +16071,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -16116,32 +16116,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -16156,195 +16156,200 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17947,12 +17952,12 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Автор</translation> </message> @@ -18022,53 +18027,53 @@ <translation>&Сравнить версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды hg log.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation>Alt+О</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Задайте данные, которые будут посланы процессу hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> @@ -18088,12 +18093,12 @@ <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -18108,17 +18113,17 @@ <translation>Метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -18197,6 +18202,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18702,6 +18723,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19502,7 +19576,7 @@ <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> @@ -19537,7 +19611,7 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -19552,7 +19626,7 @@ <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> @@ -19642,7 +19716,7 @@ <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> @@ -19747,7 +19821,7 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation>Специфический</translation> </message> @@ -19772,12 +19846,12 @@ <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -19812,7 +19886,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19892,7 +19966,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19912,12 +19986,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -19941,6 +20015,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50944,17 +51038,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -50965,30 +51059,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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> @@ -50998,7 +51092,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51015,7 +51109,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_tr.ts Sat Feb 11 14:54:14 2012 +0100 @@ -16204,87 +16204,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -16299,180 +16299,185 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <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="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <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="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <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="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18077,12 +18082,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation>Yazar</translation> </message> @@ -18187,52 +18192,52 @@ <translation>Gözden Geçirmeleri Karşılaş&tır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation>Hatalar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation>Girdi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation>Hg işlem girdilerini göndermek için basınız</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation>&Gönder</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation>Hg işlemlerine göndermek için verileri giriniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation>Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation>&Parola Modu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -18252,27 +18257,27 @@ <translation>Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <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> @@ -18326,6 +18331,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -18817,6 +18838,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -19677,7 +19751,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19772,17 +19846,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -19822,17 +19896,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -19867,7 +19941,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19947,7 +20021,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19967,12 +20041,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -19996,6 +20070,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50942,24 +51036,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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> @@ -50968,7 +51062,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50985,23 +51079,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -51012,7 +51106,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Feb 10 19:33:45 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Feb 11 14:54:14 2012 +0100 @@ -17306,87 +17306,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="521"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="863"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -17396,180 +17396,185 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1897"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1920"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2090"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1966"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1997"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> <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="2276"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2175"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> <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="2357"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2424"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -19159,12 +19164,12 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1138"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1174"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1171"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> @@ -19259,52 +19264,52 @@ <translation type="unfinished">比较修订(&C)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="390"/> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> <source>Input</source> <translation type="unfinished">输入</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="410"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> <source>&Send</source> <translation type="unfinished">发送(&S)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="423"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> <source>&Password Mode</source> <translation type="unfinished">密码模式(&P)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -19324,27 +19329,27 @@ <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="688"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="690"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="496"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -19423,6 +19428,22 @@ <source>Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="355"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -19924,6 +19945,59 @@ </message> </context> <context> + <name>HgPhaseDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="14"/> + <source>Mercurial Phases</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="23"/> + <source>&Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> + <source>Phase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="53"/> + <source>Select the phase to be set for the specified revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="60"/> + <source>Select to force the phase change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="63"/> + <source>Force Phase Change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="30"/> + <source>Public</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="31"/> + <source>Draft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py" line="32"/> + <source>Secret</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgProjectBrowserHelper</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="454"/> @@ -20684,7 +20758,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -20719,7 +20793,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -20734,7 +20808,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20814,7 +20888,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20919,7 +20993,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20944,12 +21018,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20984,7 +21058,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -21064,7 +21138,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -21084,12 +21158,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -21113,6 +21187,26 @@ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -55104,30 +55198,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> <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="1709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <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="1717"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1229"/> <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="1258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -55138,23 +55232,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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="1724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/> <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> @@ -55162,7 +55256,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
