Mercurial Repositories > eric / changeset
changeset
Added support for the graft command as of Mercurial 2.0.
Wed, 22 Feb 2012 19:22:42 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 22 Feb 2012 19:22:42 +0100
- changeset 1655
- d2b583fdde1c
- parent 1654
- 08264848be08
- child 1658
- c61997a63efe
Added support for the graft command as of Mercurial 2.0.
--- a/APIs/Python3/eric5.api Wed Feb 22 19:14:07 2012 +0100 +++ b/APIs/Python3/eric5.api Wed Feb 22 19:22:42 2012 +0100 @@ -3557,6 +3557,12 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.menuTitle?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.setObjects?4(vcsObject, projectObject) eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper?1() +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_currentUserCheckBox_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_revisionsEdit_textChanged?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_userEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog.on_userGroup_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.HgGraftDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.on_patchFileButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog.on_patchFileEdit_textChanged?4(txt) @@ -3883,6 +3889,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftContinue?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentifyBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgImport?4(name)
--- a/APIs/Python3/eric5.bas Wed Feb 22 19:14:07 2012 +0100 +++ b/APIs/Python3/eric5.bas Wed Feb 22 19:22:42 2012 +0100 @@ -255,6 +255,7 @@ HgFetchDialog QDialog Ui_HgFetchDialog HgGpgSignDialog QDialog Ui_HgGpgSignDialog HgGpgSignaturesDialog QDialog Ui_HgGpgSignaturesDialog +HgGraftDialog QDialog Ui_HgGraftDialog HgImportDialog QDialog Ui_HgImportDialog HgLogBrowserDialog QDialog Ui_HgLogBrowserDialog HgLogDialog QWidget Ui_HgLogDialog
--- a/Documentation/Help/source.qhp Wed Feb 22 19:14:07 2012 +0100 +++ b/Documentation/Help/source.qhp Wed Feb 22 19:22:42 2012 +0100 @@ -459,6 +459,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> @@ -4723,6 +4724,8 @@ <keyword name="Hg.hgForget" id="Hg.hgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgForget" /> <keyword name="Hg.hgGetBranchesList" id="Hg.hgGetBranchesList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBranchesList" /> <keyword name="Hg.hgGetTagsList" id="Hg.hgGetTagsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetTagsList" /> + <keyword name="Hg.hgGraft" id="Hg.hgGraft" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraft" /> + <keyword name="Hg.hgGraftContinue" id="Hg.hgGraftContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGraftContinue" /> <keyword name="Hg.hgIdentify" id="Hg.hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentify" /> <keyword name="Hg.hgIdentifyBundle" id="Hg.hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIdentifyBundle" /> <keyword name="Hg.hgImport" id="Hg.hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgImport" /> @@ -5028,6 +5031,15 @@ <keyword name="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" id="HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_signaturesList_itemSelectionChanged" /> <keyword name="HgGpgSignaturesDialog.on_verifyButton_clicked" id="HgGpgSignaturesDialog.on_verifyButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.on_verifyButton_clicked" /> <keyword name="HgGpgSignaturesDialog.start" id="HgGpgSignaturesDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html#HgGpgSignaturesDialog.start" /> + <keyword name="HgGraftDialog" id="HgGraftDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog" /> + <keyword name="HgGraftDialog (Constructor)" id="HgGraftDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.__init__" /> + <keyword name="HgGraftDialog (Module)" id="HgGraftDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> + <keyword name="HgGraftDialog.__updateOk" id="HgGraftDialog.__updateOk" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.__updateOk" /> + <keyword name="HgGraftDialog.getData" id="HgGraftDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.getData" /> + <keyword name="HgGraftDialog.on_currentUserCheckBox_toggled" id="HgGraftDialog.on_currentUserCheckBox_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_currentUserCheckBox_toggled" /> + <keyword name="HgGraftDialog.on_revisionsEdit_textChanged" id="HgGraftDialog.on_revisionsEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_revisionsEdit_textChanged" /> + <keyword name="HgGraftDialog.on_userEdit_textChanged" id="HgGraftDialog.on_userEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_userEdit_textChanged" /> + <keyword name="HgGraftDialog.on_userGroup_toggled" id="HgGraftDialog.on_userGroup_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html#HgGraftDialog.on_userGroup_toggled" /> <keyword name="HgImportDialog" id="HgImportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog" /> <keyword name="HgImportDialog (Constructor)" id="HgImportDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.__init__" /> <keyword name="HgImportDialog (Module)" id="HgImportDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> @@ -5184,6 +5196,8 @@ <keyword name="HgProjectHelper.__hgEditUserConfig" id="HgProjectHelper.__hgEditUserConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgEditUserConfig" /> <keyword name="HgProjectHelper.__hgExport" id="HgProjectHelper.__hgExport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExport" /> <keyword name="HgProjectHelper.__hgExtendedDiff" id="HgProjectHelper.__hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExtendedDiff" /> + <keyword name="HgProjectHelper.__hgGraft" id="HgProjectHelper.__hgGraft" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraft" /> + <keyword name="HgProjectHelper.__hgGraftContinue" id="HgProjectHelper.__hgGraftContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgGraftContinue" /> <keyword name="HgProjectHelper.__hgHeads" id="HgProjectHelper.__hgHeads" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgHeads" /> <keyword name="HgProjectHelper.__hgIdentify" id="HgProjectHelper.__hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentify" /> <keyword name="HgProjectHelper.__hgIdentifyBundle" id="HgProjectHelper.__hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentifyBundle" /> @@ -11797,6 +11811,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html Wed Feb 22 19:22:42 2012 +0100 @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog</title> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog</h1> +<p> +Module implementing a dialog to enter the data for a graft session. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgGraftDialog">HgGraftDialog</a></td> +<td>Class implementing a dialog to enter the data for a graft session.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgGraftDialog" ID="HgGraftDialog"></a> +<h2>HgGraftDialog</h2> +<p> + Class implementing a dialog to enter the data for a graft session. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgGraftDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgGraftDialog.__init__">HgGraftDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgGraftDialog.__updateOk">__updateOk</a></td> +<td>Private slot to update the state of the OK button.</td> +</tr><tr> +<td><a href="#HgGraftDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr><tr> +<td><a href="#HgGraftDialog.on_currentUserCheckBox_toggled">on_currentUserCheckBox_toggled</a></td> +<td>Private slot to handle changes of the currentuser state.</td> +</tr><tr> +<td><a href="#HgGraftDialog.on_revisionsEdit_textChanged">on_revisionsEdit_textChanged</a></td> +<td>Private slot to react upon changes of revisions.</td> +</tr><tr> +<td><a href="#HgGraftDialog.on_userEdit_textChanged">on_userEdit_textChanged</a></td> +<td>Private slot to handle changes of the user name.</td> +</tr><tr> +<td><a href="#HgGraftDialog.on_userGroup_toggled">on_userGroup_toggled</a></td> +<td>Private slot to handle changes of the user group state.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgGraftDialog.__init__" ID="HgGraftDialog.__init__"></a> +<h4>HgGraftDialog (Constructor)</h4> +<b>HgGraftDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgGraftDialog.__updateOk" ID="HgGraftDialog.__updateOk"></a> +<h4>HgGraftDialog.__updateOk</h4> +<b>__updateOk</b>(<i></i>) +<p> + Private slot to update the state of the OK button. +</p><a NAME="HgGraftDialog.getData" ID="HgGraftDialog.getData"></a> +<h4>HgGraftDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with list of revisions, a tuple giving a + flag indicating to set the user, a flag indicating to use the + current user and the user name and another tuple giving a flag + indicating to set the date, a flag indicating to use the + current date and the date (list of strings, (boolean, boolean, string), + (boolean, boolean, string)) +</dd> +</dl><a NAME="HgGraftDialog.on_currentUserCheckBox_toggled" ID="HgGraftDialog.on_currentUserCheckBox_toggled"></a> +<h4>HgGraftDialog.on_currentUserCheckBox_toggled</h4> +<b>on_currentUserCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the currentuser state. +</p><dl> +<dt><i>checked</i></dt> +<dd> +flag giving the checked state (boolean) +</dd> +</dl><a NAME="HgGraftDialog.on_revisionsEdit_textChanged" ID="HgGraftDialog.on_revisionsEdit_textChanged"></a> +<h4>HgGraftDialog.on_revisionsEdit_textChanged</h4> +<b>on_revisionsEdit_textChanged</b>(<i></i>) +<p> + Private slot to react upon changes of revisions. +</p><a NAME="HgGraftDialog.on_userEdit_textChanged" ID="HgGraftDialog.on_userEdit_textChanged"></a> +<h4>HgGraftDialog.on_userEdit_textChanged</h4> +<b>on_userEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the user name. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgGraftDialog.on_userGroup_toggled" ID="HgGraftDialog.on_userGroup_toggled"></a> +<h4>HgGraftDialog.on_userGroup_toggled</h4> +<b>on_userGroup_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the user group state. +</p><dl> +<dt><i>checked</i></dt> +<dd> +flag giving the checked state (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Wed Feb 22 19:14:07 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Wed Feb 22 19:22:42 2012 +0100 @@ -106,6 +106,12 @@ <td><a href="#HgProjectHelper.__hgExtendedDiff">__hgExtendedDiff</a></td> <td>Private slot used to perform a hg diff with the selection of revisions.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgGraft">__hgGraft</a></td> +<td>Private slot used to copy changesets from another branch.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgGraftContinue">__hgGraftContinue</a></td> +<td>Private slot used to continue the last copying session after conflicts were resolved.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgHeads">__hgHeads</a></td> <td>Private slot used to show the heads of the repository.</td> </tr><tr> @@ -301,6 +307,17 @@ <b>__hgExtendedDiff</b>(<i></i>) <p> Private slot used to perform a hg diff with the selection of revisions. +</p><a NAME="HgProjectHelper.__hgGraft" ID="HgProjectHelper.__hgGraft"></a> +<h4>HgProjectHelper.__hgGraft</h4> +<b>__hgGraft</b>(<i></i>) +<p> + Private slot used to copy changesets from another branch. +</p><a NAME="HgProjectHelper.__hgGraftContinue" ID="HgProjectHelper.__hgGraftContinue"></a> +<h4>HgProjectHelper.__hgGraftContinue</h4> +<b>__hgGraftContinue</b>(<i></i>) +<p> + Private slot used to continue the last copying session after conflicts + were resolved. </p><a NAME="HgProjectHelper.__hgHeads" ID="HgProjectHelper.__hgHeads"></a> <h4>HgProjectHelper.__hgHeads</h4> <b>__hgHeads</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Feb 22 19:14:07 2012 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Wed Feb 22 19:22:42 2012 +0100 @@ -143,6 +143,12 @@ <td><a href="#Hg.hgGetTagsList">hgGetTagsList</a></td> <td>Public method to get the list of tags.</td> </tr><tr> +<td><a href="#Hg.hgGraft">hgGraft</a></td> +<td>Public method to copy changesets from another branch.</td> +</tr><tr> +<td><a href="#Hg.hgGraftContinue">hgGraftContinue</a></td> +<td>Public method to continue copying changesets from another branch.</td> +</tr><tr> <td><a href="#Hg.hgIdentify">hgIdentify</a></td> <td>Public method to identify the current working directory.</td> </tr><tr> @@ -604,6 +610,36 @@ <dd> list of tags (list of string) </dd> +</dl><a NAME="Hg.hgGraft" ID="Hg.hgGraft"></a> +<h4>Hg.hgGraft</h4> +<b>hgGraft</b>(<i>path</i>) +<p> + Public method to copy changesets from another branch. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> +</dl><a NAME="Hg.hgGraftContinue" ID="Hg.hgGraftContinue"></a> +<h4>Hg.hgGraftContinue</h4> +<b>hgGraftContinue</b>(<i>path</i>) +<p> + Public method to continue copying changesets from another branch. +</p><dl> +<dt><i>path</i></dt> +<dd> +directory name of the project (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the project should be reread (boolean) +</dd> </dl><a NAME="Hg.hgIdentify" ID="Hg.hgIdentify"></a> <h4>Hg.hgIdentify</h4> <b>hgIdentify</b>(<i>name</i>)
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Wed Feb 22 19:14:07 2012 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Wed Feb 22 19:22:42 2012 +0100 @@ -102,6 +102,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html">HgExtensionProjectHelper</a></td> <td>Module implementing the project helper base for Mercurial extension interfaces.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html">HgGraftDialog</a></td> +<td>Module implementing a dialog to enter the data for a graft session.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html">HgImportDialog</a></td> <td>Module implementing a dialog to enter data for the Mercurial import command.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Wed Feb 22 19:22:42 2012 +0100 @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2012 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a graft session. +""" + +from PyQt4.QtCore import pyqtSlot, QDateTime +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgGraftDialog import Ui_HgGraftDialog + + +class HgGraftDialog(QDialog, Ui_HgGraftDialog): + """ + Class implementing a dialog to enter the data for a graft session. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) + + self.__updateOk() + + def __updateOk(self): + """ + Private slot to update the state of the OK button. + """ + enable = self.revisionsEdit.toPlainText() != "" + if self.userGroup.isChecked(): + enable = enable and \ + (self.currentUserCheckBox.isChecked() or \ + self.userEdit.text() != "") + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) + + @pyqtSlot() + def on_revisionsEdit_textChanged(self): + """ + Private slot to react upon changes of revisions. + """ + self.__updateOk() + + @pyqtSlot(bool) + def on_userGroup_toggled(self, checked): + """ + Private slot to handle changes of the user group state. + + @param checked flag giving the checked state (boolean) + """ + self.__updateOk() + + @pyqtSlot(bool) + def on_currentUserCheckBox_toggled(self, checked): + """ + Private slot to handle changes of the currentuser state. + + @param checked flag giving the checked state (boolean) + """ + self.__updateOk() + + @pyqtSlot(str) + def on_userEdit_textChanged(self, txt): + """ + Private slot to handle changes of the user name. + + @param txt text of the edit (string) + """ + self.__updateOk() + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple with list of revisions, a tuple giving a + flag indicating to set the user, a flag indicating to use the + current user and the user name and another tuple giving a flag + indicating to set the date, a flag indicating to use the + current date and the date (list of strings, (boolean, boolean, string), + (boolean, boolean, string)) + """ + userData = (self.userGroup.isChecked(), + self.currentUserCheckBox.isChecked(), + self.userEdit.text()) + dateData = (self.dateGroup.isChecked(), + self.currentDateCheckBox.isChecked(), + self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm")) + return (self.revisionsEdit.toPlainText().strip().splitlines(), + userData, dateData)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui Wed Feb 22 19:22:42 2012 +0100 @@ -0,0 +1,266 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgGraftDialog</class> + <widget class="QDialog" name="HgGraftDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>382</height> + </rect> + </property> + <property name="windowTitle"> + <string>Copy Changesets</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revisions</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <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> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="userGroup"> + <property name="toolTip"> + <string>Select to give user information</string> + </property> + <property name="title"> + <string>User</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="currentUserCheckBox"> + <property name="toolTip"> + <string>Select to use the name of the current user</string> + </property> + <property name="text"> + <string>Use current user</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="userEdit"> + <property name="toolTip"> + <string>Enter the user name to be used</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="dateGroup"> + <property name="toolTip"> + <string>Select to give date and time information</string> + </property> + <property name="title"> + <string>Date and Time</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="3"> + <widget class="QCheckBox" name="currentDateCheckBox"> + <property name="toolTip"> + <string>Select to use the current date and time</string> + </property> + <property name="text"> + <string>Use current date and time</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Date/Time:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QDateTimeEdit" name="dateTimeEdit"> + <property name="toolTip"> + <string>Enter the date and time to be used</string> + </property> + <property name="displayFormat"> + <string notr="true">yyyy-MM-dd hh:mm</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>241</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>revisionsEdit</tabstop> + <tabstop>userGroup</tabstop> + <tabstop>currentUserCheckBox</tabstop> + <tabstop>userEdit</tabstop> + <tabstop>dateGroup</tabstop> + <tabstop>currentDateCheckBox</tabstop> + <tabstop>dateTimeEdit</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgGraftDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>231</x> + <y>372</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>212</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgGraftDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>299</x> + <y>372</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>212</y> + </hint> + </hints> + </connection> + <connection> + <sender>currentUserCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>label_3</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>52</x> + <y>193</y> + </hint> + <hint type="destinationlabel"> + <x>52</x> + <y>217</y> + </hint> + </hints> + </connection> + <connection> + <sender>currentUserCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>userEdit</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>180</x> + <y>195</y> + </hint> + <hint type="destinationlabel"> + <x>179</x> + <y>221</y> + </hint> + </hints> + </connection> + <connection> + <sender>currentDateCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>label_4</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>72</x> + <y>287</y> + </hint> + <hint type="destinationlabel"> + <x>69</x> + <y>308</y> + </hint> + </hints> + </connection> + <connection> + <sender>currentDateCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>dateTimeEdit</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>122</x> + <y>290</y> + </hint> + <hint type="destinationlabel"> + <x>120</x> + <y>312</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed Feb 22 19:14:07 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed Feb 22 19:22:42 2012 +0100 @@ -861,6 +861,37 @@ )) self.hgPhaseAct.triggered[()].connect(self.__hgPhase) self.actions.append(self.hgPhaseAct) + + self.hgGraftAct = E5Action(self.trUtf8('Copy Changesets'), + UI.PixmapCache.getIcon("vcsGraft.png"), + self.trUtf8('Copy Changesets'), + 0, 0, self, 'mercurial_graft') + self.hgGraftAct.setStatusTip(self.trUtf8( + 'Copies changesets from another branch' + )) + self.hgGraftAct.setWhatsThis(self.trUtf8( + """<b>Copy Changesets</b>""" + """<p>This copies changesets from another branch on top of the""" + """ current working directory with the user, date and description""" + """ of the original changeset.</p>""" + )) + self.hgGraftAct.triggered[()].connect(self.__hgGraft) + self.actions.append(self.hgGraftAct) + + self.hgGraftContinueAct = E5Action( + self.trUtf8('Continue Copying Session'), + self.trUtf8('Continue Copying Session'), + 0, 0, self, 'mercurial_graft_continue') + self.hgGraftContinueAct.setStatusTip(self.trUtf8( + 'Continue the last copying session after conflicts were resolved' + )) + self.hgGraftContinueAct.setWhatsThis(self.trUtf8( + """<b>Continue Copying Session</b>""" + """<p>This continues the last copying session after conflicts were""" + """ resolved.</p>""" + )) + self.hgGraftContinueAct.triggered[()].connect(self.__hgGraftContinue) + self.actions.append(self.hgGraftContinueAct) def initMenu(self, menu): """ @@ -934,6 +965,15 @@ self.__extensions[extensionName].initMenu(self.__extensionsMenu)) self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) + if self.vcs.version >= (2, 0): + graftMenu = QMenu(self.trUtf8("Graft"), menu) + graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) + graftMenu.setTearOffEnabled(True) + graftMenu.addAction(self.hgGraftAct) + graftMenu.addAction(self.hgGraftContinueAct) + else: + graftMenu = None + act = menu.addAction( UI.PixmapCache.getIcon( os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), @@ -951,6 +991,9 @@ menu.addAction(self.hgOutgoingAct) menu.addAction(self.hgPushAct) menu.addSeparator() + if graftMenu is not None: + menu.addMenu(graftMenu) + menu.addSeparator() menu.addMenu(bundleMenu) menu.addMenu(patchMenu) menu.addSeparator() @@ -1310,3 +1353,30 @@ Private slot used to change the phase of revisions. """ self.vcs.hgPhase(self.project.ppath) + + def __hgGraft(self): + """ + Private slot used to copy changesets from another branch. + """ + shouldReopen = self.vcs.hgGraft(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Copy Changesets"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgGraftContinue(self): + """ + Private slot used to continue the last copying session after conflicts + were resolved. + """ + shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath()) + if shouldReopen: + res = E5MessageBox.yesNo(None, + self.trUtf8("Copy Changesets (Continue)"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Feb 22 19:14:07 2012 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Wed Feb 22 19:22:42 2012 +0100 @@ -51,6 +51,7 @@ from .HgImportDialog import HgImportDialog from .HgExportDialog import HgExportDialog from .HgPhaseDialog import HgPhaseDialog +from .HgGraftDialog import HgGraftDialog from .BookmarksExtension.bookmarks import Bookmarks from .QueuesExtension.queues import Queues @@ -2525,6 +2526,78 @@ return res + def hgGraft(self, path): + """ + Public method to copy changesets from another branch. + + @param path directory name of the project (string) + @return flag indicating that the project should be reread (boolean) + """ + # find the root of the repo + repodir = self.splitPath(path)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return False + + res = False + dlg = HgGraftDialog() + if dlg.exec_() == QDialog.Accepted: + revs, (userData, currentUser, userName), \ + (dateData, currentDate, dateStr) = dlg.getData() + + args = [] + args.append("graft") + args.append("--verbose") + if userData: + if currentUser: + args.append("--currentuser") + else: + args.append("--user") + args.append(userName) + if dateData: + if currentDate: + args.append("--currentdate") + else: + args.append("--date") + args.append(dateStr) + args.extend(revs) + + dia = HgDialog(self.trUtf8('Copy Changesets'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + + def hgGraftContinue(self, path): + """ + Public method to continue copying changesets from another branch. + + @param path directory name of the project (string) + @return flag indicating that the project should be reread (boolean) + """ + # find the root of the repo + repodir = self.splitPath(path)[0] + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + args = [] + args.append("graft") + args.append("--continue") + args.append("--verbose") + + dia = HgDialog(self.trUtf8('Copy Changesets (Continue)'), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + ############################################################################ ## Methods to handle extensions are below. ############################################################################
--- a/changelog Wed Feb 22 19:14:07 2012 +0100 +++ b/changelog Wed Feb 22 19:22:42 2012 +0100 @@ -10,6 +10,7 @@ project configuration page of configuration dialog) - Version Control System Interfaces -- Mercurial + --- added support for the graft command as of Mercurial 2.0 --- added support for Phases as of Mercurial 2.1 -- Subversion --- changed code to make the subversion plug-ins compatible with the new
--- a/eric5.e4p Wed Feb 22 19:14:07 2012 +0100 +++ b/eric5.e4p Wed Feb 22 19:22:42 2012 +0100 @@ -960,6 +960,7 @@ <Source>Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py</Source> <Source>Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py</Source> <Source>Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1240,6 +1241,7 @@ <Form>Helpviewer/Sync/SyncCheckPage.ui</Form> <Form>Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.ui</Form> <Form>Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_cs.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16497,42 +16497,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <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="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <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="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -16542,47 +16542,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="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <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="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <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="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <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="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -16597,112 +16597,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <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="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <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="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <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="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <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="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <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="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <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="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <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="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -16712,75 +16712,85 @@ <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="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <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="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18258,6 +18268,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19998,7 +20086,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="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -20033,7 +20121,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="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -20048,7 +20136,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -20138,7 +20226,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="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -20263,17 +20351,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -20308,7 +20396,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20388,7 +20476,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20408,12 +20496,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -20457,6 +20545,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51918,30 +52046,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51952,23 +52080,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="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -51976,7 +52104,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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_de.ts Wed Feb 22 19:22:42 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> @@ -1633,8 +1632,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"/> @@ -1852,7 +1851,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <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> @@ -13047,7 +13046,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="901"/> - <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> @@ -16104,270 +16103,280 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <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="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <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="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <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="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <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="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <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="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <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="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <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="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <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="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <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="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <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="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <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="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <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="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <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="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <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="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17832,6 +17841,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation>Revisionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation>Auswählen, um Nutzerinformationen einzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation>Nutzer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation>Auswählen, um den Namen des aktuellen Nutzers zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation>aktuellen Nutzer verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation>Gib den zu verwendenden Nutzernamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation>Auswählen, um Datums- und Zeitinformationen einzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation>Datum und Zeit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation>Auswählen, um das aktuelle Datum und die aktuelle Zeit zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation>aktuelles Datum und Zeit verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation>Datum/Zeit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation>Gib das zu verwendenden Datum und Zeit ein</translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19522,7 +19609,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="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -19557,7 +19644,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> @@ -19572,7 +19659,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -19652,7 +19739,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="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19757,7 +19844,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="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> @@ -19782,12 +19869,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="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -19822,7 +19909,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="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -19902,7 +19989,7 @@ <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -19922,12 +20009,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="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> @@ -19971,6 +20058,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50816,24 +50943,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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> @@ -50842,7 +50969,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50859,24 +50986,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -50887,7 +51014,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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 Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_en.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16016,270 +16016,280 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17720,6 +17730,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19518,7 +19606,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19633,32 +19721,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -19693,7 +19781,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19773,7 +19861,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -19793,12 +19881,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -19842,6 +19930,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -50363,30 +50491,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -50397,23 +50525,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -50421,7 +50549,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_es.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16333,42 +16333,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <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="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <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="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> @@ -16378,32 +16378,32 @@ <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <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="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <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="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -16418,200 +16418,210 @@ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <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="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <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="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <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="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <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="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <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="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <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="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <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="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <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="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <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="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18106,6 +18116,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished">Seleccionar para dar información del usuario</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished">Usuario</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished">Seleccionar para utilizar el nombre del usuario actual</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished">Utilizar usuario actual</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished">Seleccionar para dar información de fecha y hora</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished">Fecha y Hora</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished">Seleccionar para utilizar la fecha y hora actuales</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished">Utilizar fecha y hora actuales</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished">Fecha/Hora:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19871,7 +19959,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="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> @@ -19891,7 +19979,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> @@ -19906,7 +19994,7 @@ <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -19996,7 +20084,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="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -20101,7 +20189,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="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation>Especial</translation> </message> @@ -20126,12 +20214,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="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -20166,7 +20254,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="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -20246,7 +20334,7 @@ <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> @@ -20266,12 +20354,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="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> @@ -20315,6 +20403,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51574,17 +51702,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -51595,31 +51723,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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> @@ -51628,7 +51756,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51645,7 +51773,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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 Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_fr.ts Wed Feb 22 19:22:42 2012 +0100 @@ -17621,87 +17621,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -17711,185 +17711,195 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -19349,6 +19359,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished">Nom d'utilisateur:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -21073,7 +21161,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -21108,7 +21196,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -21123,7 +21211,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -21203,7 +21291,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -21308,7 +21396,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -21333,12 +21421,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21373,7 +21461,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -21453,7 +21541,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -21473,12 +21561,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -21522,6 +21610,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -55836,30 +55964,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -55870,23 +55998,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -55894,7 +56022,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_it.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16263,42 +16263,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <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="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <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="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <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="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -16308,47 +16308,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <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="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <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="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -16363,185 +16363,195 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <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="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <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="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <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="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <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="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <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="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <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="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <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="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <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="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18019,6 +18029,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19768,7 +19856,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -19803,7 +19891,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -19818,7 +19906,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -19908,7 +19996,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -20033,17 +20121,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="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -20078,7 +20166,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20158,7 +20246,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20178,12 +20266,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -20227,6 +20315,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51410,24 +51538,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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> @@ -51436,7 +51564,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51453,24 +51581,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -51480,7 +51608,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_ru.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16365,42 +16365,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -16410,32 +16410,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -16450,200 +16450,210 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18116,6 +18126,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished">Имя пользователя:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -19870,7 +19958,7 @@ <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> @@ -19905,7 +19993,7 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -19920,7 +20008,7 @@ <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> @@ -20010,7 +20098,7 @@ <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> @@ -20115,7 +20203,7 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation>Специфический</translation> </message> @@ -20140,12 +20228,12 @@ <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -20180,7 +20268,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20260,7 +20348,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20280,12 +20368,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -20329,6 +20417,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51654,17 +51782,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -51675,30 +51803,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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> @@ -51708,7 +51836,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51725,7 +51853,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_tr.ts Wed Feb 22 19:22:42 2012 +0100 @@ -16498,87 +16498,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -16593,185 +16593,195 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <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="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <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="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <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="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18246,6 +18256,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished">Kullanıcı Adı:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -20045,7 +20133,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -20140,17 +20228,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20190,17 +20278,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -20235,7 +20323,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20315,7 +20403,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -20335,12 +20423,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -20384,6 +20472,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -51652,24 +51780,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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> @@ -51678,7 +51806,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51695,23 +51823,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -51722,7 +51850,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Feb 22 19:14:07 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Feb 22 19:22:42 2012 +0100 @@ -17582,87 +17582,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="321"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="366"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="367"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="522"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="639"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="703"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="832"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="864"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="865"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="914"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="915"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1343"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1344"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -17672,185 +17672,195 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1588"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1642"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1782"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1792"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1899"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2195"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1998"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1999"/> <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="2277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2278"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2050"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2334"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2358"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2359"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/> <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="2664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <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="2425"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2426"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2472"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2473"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -19310,6 +19320,84 @@ </message> </context> <context> + <name>HgGraftDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="14"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="23"/> + <source>Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="29"/> + <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/HgGraftDialog.ui" line="45"/> + <source>Select to give user information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="48"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="60"/> + <source>Select to use the name of the current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="63"/> + <source>Use current user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="70"/> + <source>Username:</source> + <translation type="unfinished">用户名：</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="77"/> + <source>Enter the user name to be used</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="87"/> + <source>Select to give date and time information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="90"/> + <source>Date and Time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="102"/> + <source>Select to use the current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="105"/> + <source>Use current date and time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="112"/> + <source>Date/Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="119"/> + <source>Enter the date and time to be used</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgImportDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> @@ -21034,7 +21122,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -21069,7 +21157,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -21084,7 +21172,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -21164,7 +21252,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -21269,7 +21357,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -21294,12 +21382,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -21334,7 +21422,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -21414,7 +21502,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -21434,12 +21522,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -21483,6 +21571,46 @@ <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -55790,30 +55918,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <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="1259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1260"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -55824,23 +55952,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1722"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> <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="1725"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1726"/> <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> @@ -55848,7 +55976,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
