Mercurial Repositories > eric / changeset
changeset
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
Fri, 09 Sep 2011 19:15:06 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 09 Sep 2011 19:15:06 +0200
- changeset 1311
- 95685f9ad9f8
- parent 1310
- 7fdcfa822e3e
- child 1312
- 12506dba74dc
Added support for importing patches to the Mercurial interface and made it's revert action check, if the project should be reread.
--- a/APIs/Python3/eric5.api Fri Sep 09 12:29:45 2011 +0200 +++ b/APIs/Python3/eric5.api Fri Sep 09 19:15:06 2011 +0200 @@ -3405,6 +3405,10 @@ 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.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) +eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.HgImportDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.COLORNAMES?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.COLORS?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.AuthorColumn?7 @@ -3722,6 +3726,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir) 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) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads") eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags=True) @@ -3733,6 +3738,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRevert?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRollback?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgServe?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowBranch?4(name) @@ -3766,7 +3772,6 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRegisteredState?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRemove?4(name, project=False, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRepositoryInfos?4(ppath) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRevert?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsShutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsStatus?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsSwitch?4(name)
--- a/Documentation/Help/source.qhp Fri Sep 09 12:29:45 2011 +0200 +++ b/Documentation/Help/source.qhp Fri Sep 09 19:15:06 2011 +0200 @@ -424,6 +424,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.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.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" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> @@ -8550,6 +8551,13 @@ <keyword name="HgStatusDialog.on_statusList_itemChanged" id="HgStatusDialog.on_statusList_itemChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusList_itemChanged" /> <keyword name="HgStatusDialog.on_statusList_itemSelectionChanged" id="HgStatusDialog.on_statusList_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.on_statusList_itemSelectionChanged" /> <keyword name="HgStatusDialog.start" id="HgStatusDialog.start" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.start" /> + <keyword name="HgImportDialog (Module)" id="HgImportDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> + <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.__updateOK" id="HgImportDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.__updateOK" /> + <keyword name="HgImportDialog.getParameters" id="HgImportDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.getParameters" /> + <keyword name="HgImportDialog.on_patchFileButton_clicked" id="HgImportDialog.on_patchFileButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.on_patchFileButton_clicked" /> + <keyword name="HgImportDialog.on_patchFileEdit_textChanged" id="HgImportDialog.on_patchFileEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html#HgImportDialog.on_patchFileEdit_textChanged" /> <keyword name="hg (Module)" id="hg (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html" /> <keyword name="Hg" id="Hg" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg" /> <keyword name="Hg (Constructor)" id="Hg (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__init__" /> @@ -8578,6 +8586,7 @@ <keyword name="Hg.hgGetTagsList" id="Hg.hgGetTagsList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetTagsList" /> <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" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> <keyword name="Hg.hgInfo" id="Hg.hgInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgInfo" /> <keyword name="Hg.hgListTagBranch" id="Hg.hgListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgListTagBranch" /> @@ -8589,6 +8598,7 @@ <keyword name="Hg.hgPush" id="Hg.hgPush" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPush" /> <keyword name="Hg.hgRecover" id="Hg.hgRecover" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRecover" /> <keyword name="Hg.hgResolve" id="Hg.hgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgResolve" /> + <keyword name="Hg.hgRevert" id="Hg.hgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRevert" /> <keyword name="Hg.hgRollback" id="Hg.hgRollback" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgRollback" /> <keyword name="Hg.hgServe" id="Hg.hgServe" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgServe" /> <keyword name="Hg.hgShowBranch" id="Hg.hgShowBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgShowBranch" /> @@ -8622,7 +8632,6 @@ <keyword name="Hg.vcsRegisteredState" id="Hg.vcsRegisteredState" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsRegisteredState" /> <keyword name="Hg.vcsRemove" id="Hg.vcsRemove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsRemove" /> <keyword name="Hg.vcsRepositoryInfos" id="Hg.vcsRepositoryInfos" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsRepositoryInfos" /> - <keyword name="Hg.vcsRevert" id="Hg.vcsRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsRevert" /> <keyword name="Hg.vcsShutdown" id="Hg.vcsShutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsShutdown" /> <keyword name="Hg.vcsStatus" id="Hg.vcsStatus" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsStatus" /> <keyword name="Hg.vcsSwitch" id="Hg.vcsSwitch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsSwitch" /> @@ -8680,6 +8689,7 @@ <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" /> + <keyword name="HgProjectHelper.__hgImport" id="HgProjectHelper.__hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgImport" /> <keyword name="HgProjectHelper.__hgIncoming" id="HgProjectHelper.__hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIncoming" /> <keyword name="HgProjectHelper.__hgLogBrowser" id="HgProjectHelper.__hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogBrowser" /> <keyword name="HgProjectHelper.__hgOutgoing" id="HgProjectHelper.__hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgOutgoing" /> @@ -8691,6 +8701,7 @@ <keyword name="HgProjectHelper.__hgPushNewBranch" id="HgProjectHelper.__hgPushNewBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPushNewBranch" /> <keyword name="HgProjectHelper.__hgRecover" id="HgProjectHelper.__hgRecover" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRecover" /> <keyword name="HgProjectHelper.__hgResolve" id="HgProjectHelper.__hgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgResolve" /> + <keyword name="HgProjectHelper.__hgRevert" id="HgProjectHelper.__hgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRevert" /> <keyword name="HgProjectHelper.__hgRollback" id="HgProjectHelper.__hgRollback" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgRollback" /> <keyword name="HgProjectHelper.__hgServe" id="HgProjectHelper.__hgServe" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgServe" /> <keyword name="HgProjectHelper.__hgShowBranch" id="HgProjectHelper.__hgShowBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgShowBranch" /> @@ -8782,6 +8793,7 @@ <keyword name="HgProjectBrowserHelper.__HgLogBrowser" id="HgProjectBrowserHelper.__HgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgLogBrowser" /> <keyword name="HgProjectBrowserHelper.__HgMove" id="HgProjectBrowserHelper.__HgMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgMove" /> <keyword name="HgProjectBrowserHelper.__HgResolve" id="HgProjectBrowserHelper.__HgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolve" /> + <keyword name="HgProjectBrowserHelper.__HgRevert" id="HgProjectBrowserHelper.__HgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgRevert" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> <keyword name="HgProjectBrowserHelper._addVCSMenuBack" id="HgProjectBrowserHelper._addVCSMenuBack" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuBack" /> <keyword name="HgProjectBrowserHelper._addVCSMenuDir" id="HgProjectBrowserHelper._addVCSMenuDir" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuDir" /> @@ -11403,6 +11415,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.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> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html Fri Sep 09 19:15:06 2011 +0200 @@ -0,0 +1,127 @@ +<?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.HgImportDialog</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.HgImportDialog</h1> +<p> +Module implementing a dialog to enter data for the Mercurial import command. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgImportDialog">HgImportDialog</a></td> +<td>Class implementing a dialog to enter data for the Mercurial import command.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgImportDialog" ID="HgImportDialog"></a> +<h2>HgImportDialog</h2> +<p> + Class implementing a dialog to enter data for the Mercurial import command. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgImportDialog +<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="#HgImportDialog.__init__">HgImportDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgImportDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgImportDialog.getParameters">getParameters</a></td> +<td>Public method to retrieve the import data.</td> +</tr><tr> +<td><a href="#HgImportDialog.on_patchFileButton_clicked">on_patchFileButton_clicked</a></td> +<td>Private slot called by pressing the file selection button.</td> +</tr><tr> +<td><a href="#HgImportDialog.on_patchFileEdit_textChanged">on_patchFileEdit_textChanged</a></td> +<td>Private slot to react on changes of the patch file edit.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgImportDialog.__init__" ID="HgImportDialog.__init__"></a> +<h4>HgImportDialog (Constructor)</h4> +<b>HgImportDialog</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="HgImportDialog.__updateOK" ID="HgImportDialog.__updateOK"></a> +<h4>HgImportDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgImportDialog.getParameters" ID="HgImportDialog.getParameters"></a> +<h4>HgImportDialog.getParameters</h4> +<b>getParameters</b>(<i></i>) +<p> + Public method to retrieve the import data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple naming the patch file, a flag indicating to not commit, + a commit message, a commit date, a commit user, a strip count and + a flag indicating to enforce the import + (string, boolean, string, string, string, integer, boolean) +</dd> +</dl><a NAME="HgImportDialog.on_patchFileButton_clicked" ID="HgImportDialog.on_patchFileButton_clicked"></a> +<h4>HgImportDialog.on_patchFileButton_clicked</h4> +<b>on_patchFileButton_clicked</b>(<i></i>) +<p> + Private slot called by pressing the file selection button. +</p><a NAME="HgImportDialog.on_patchFileEdit_textChanged" ID="HgImportDialog.on_patchFileEdit_textChanged"></a> +<h4>HgImportDialog.on_patchFileEdit_textChanged</h4> +<b>on_patchFileEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to react on changes of the patch file edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +contents of the line edit (string) +</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.ProjectBrowserHelper.html Fri Sep 09 12:29:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Fri Sep 09 19:15:06 2011 +0200 @@ -82,6 +82,9 @@ <td><a href="#HgProjectBrowserHelper.__HgResolve">__HgResolve</a></td> <td>Private slot called by the context menu to resolve conflicts of a file.</td> </tr><tr> +<td><a href="#HgProjectBrowserHelper.__HgRevert">__HgRevert</a></td> +<td>Protected slot called by the context menu to revert changes made.</td> +</tr><tr> <td><a href="#HgProjectBrowserHelper._addVCSMenu">_addVCSMenu</a></td> <td>Protected method used to add the VCS menu to all project browsers.</td> </tr><tr> @@ -179,6 +182,11 @@ <b>__HgResolve</b>(<i></i>) <p> Private slot called by the context menu to resolve conflicts of a file. +</p><a NAME="HgProjectBrowserHelper.__HgRevert" ID="HgProjectBrowserHelper.__HgRevert"></a> +<h4>HgProjectBrowserHelper.__HgRevert</h4> +<b>__HgRevert</b>(<i></i>) +<p> + Protected slot called by the context menu to revert changes made. </p><a NAME="HgProjectBrowserHelper._addVCSMenu" ID="HgProjectBrowserHelper._addVCSMenu"></a> <h4>HgProjectBrowserHelper._addVCSMenu</h4> <b>_addVCSMenu</b>(<i>mainMenu</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Sep 09 12:29:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Sep 09 19:15:06 2011 +0200 @@ -112,6 +112,9 @@ <td><a href="#HgProjectHelper.__hgIdentifyBundle">__hgIdentifyBundle</a></td> <td>Private slot used to identify a changegroup file.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgImport">__hgImport</a></td> +<td>Private slot used to import a patch file.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgIncoming">__hgIncoming</a></td> <td>Private slot used to show the log of changes coming into the repository.</td> </tr><tr> @@ -145,6 +148,9 @@ <td><a href="#HgProjectHelper.__hgResolve">__hgResolve</a></td> <td>Private slot used to resolve conflicts of the local project.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgRevert">__hgRevert</a></td> +<td>Private slot used to revert changes made to the local project.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgRollback">__hgRollback</a></td> <td>Private slot used to rollback the last transaction.</td> </tr><tr> @@ -299,6 +305,11 @@ <b>__hgIdentifyBundle</b>(<i></i>) <p> Private slot used to identify a changegroup file. +</p><a NAME="HgProjectHelper.__hgImport" ID="HgProjectHelper.__hgImport"></a> +<h4>HgProjectHelper.__hgImport</h4> +<b>__hgImport</b>(<i></i>) +<p> + Private slot used to import a patch file. </p><a NAME="HgProjectHelper.__hgIncoming" ID="HgProjectHelper.__hgIncoming"></a> <h4>HgProjectHelper.__hgIncoming</h4> <b>__hgIncoming</b>(<i></i>) @@ -355,6 +366,11 @@ <b>__hgResolve</b>(<i></i>) <p> Private slot used to resolve conflicts of the local project. +</p><a NAME="HgProjectHelper.__hgRevert" ID="HgProjectHelper.__hgRevert"></a> +<h4>HgProjectHelper.__hgRevert</h4> +<b>__hgRevert</b>(<i></i>) +<p> + Private slot used to revert changes made to the local project. </p><a NAME="HgProjectHelper.__hgRollback" ID="HgProjectHelper.__hgRollback"></a> <h4>HgProjectHelper.__hgRollback</h4> <b>__hgRollback</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Sep 09 12:29:45 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Sep 09 19:15:06 2011 +0200 @@ -146,6 +146,9 @@ <td><a href="#Hg.hgIdentifyBundle">hgIdentifyBundle</a></td> <td>Public method used to identify a changegroup file.</td> </tr><tr> +<td><a href="#Hg.hgImport">hgImport</a></td> +<td>Public method to import a patch file.</td> +</tr><tr> <td><a href="#Hg.hgIncoming">hgIncoming</a></td> <td>Public method used to view the log of incoming changes from the Mercurial repository.</td> </tr><tr> @@ -179,6 +182,9 @@ <td><a href="#Hg.hgResolve">hgResolve</a></td> <td>Public method used to resolve conflicts of a file/directory.</td> </tr><tr> +<td><a href="#Hg.hgRevert">hgRevert</a></td> +<td>Public method used to revert changes made to a file/directory.</td> +</tr><tr> <td><a href="#Hg.hgRollback">hgRollback</a></td> <td>Public method used to rollback the last transaction.</td> </tr><tr> @@ -278,9 +284,6 @@ <td><a href="#Hg.vcsRepositoryInfos">vcsRepositoryInfos</a></td> <td>Public method to retrieve information about the repository.</td> </tr><tr> -<td><a href="#Hg.vcsRevert">vcsRevert</a></td> -<td>Public method used to revert changes made to a file/directory.</td> -</tr><tr> <td><a href="#Hg.vcsShutdown">vcsShutdown</a></td> <td>Public method used to shutdown the Mercurial interface.</td> </tr><tr> @@ -605,6 +608,22 @@ <dd> directory name on which to base the changegroup (string) </dd> +</dl><a NAME="Hg.hgImport" ID="Hg.hgImport"></a> +<h4>Hg.hgImport</h4> +<b>hgImport</b>(<i>name</i>) +<p> + Public method to import a patch file. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name of the project to import into (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the import contained an add, a delete + or a change to the project file (boolean) +</dd> </dl><a NAME="Hg.hgIncoming" ID="Hg.hgIncoming"></a> <h4>Hg.hgIncoming</h4> <b>hgIncoming</b>(<i>name</i>) @@ -743,6 +762,22 @@ <dd> file/directory name to be resolved (string) </dd> +</dl><a NAME="Hg.hgRevert" ID="Hg.hgRevert"></a> +<h4>Hg.hgRevert</h4> +<b>hgRevert</b>(<i>name</i>) +<p> + Public method used to revert changes made to a file/directory. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to be reverted (string) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the update contained an add + or delete (boolean) +</dd> </dl><a NAME="Hg.hgRollback" ID="Hg.hgRollback"></a> <h4>Hg.hgRollback</h4> <b>hgRollback</b>(<i>name</i>) @@ -1234,16 +1269,6 @@ <dd> string with ready formated info for display (string) </dd> -</dl><a NAME="Hg.vcsRevert" ID="Hg.vcsRevert"></a> -<h4>Hg.vcsRevert</h4> -<b>vcsRevert</b>(<i>name</i>) -<p> - Public method used to revert changes made to a file/directory. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to be reverted (string) -</dd> </dl><a NAME="Hg.vcsShutdown" ID="Hg.vcsShutdown"></a> <h4>Hg.vcsShutdown</h4> <b>vcsShutdown</b>(<i></i>)
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri Sep 09 12:29:45 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri Sep 09 19:15:06 2011 +0200 @@ -96,6 +96,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.HgImportDialog.html">HgImportDialog</a></td> +<td>Module implementing a dialog to enter data for the Mercurial import command.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html">HgLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Sep 09 12:29:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Sep 09 19:15:06 2011 +0200 @@ -115,7 +115,7 @@ self.__hasAddOrDelete = False if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", "transplant", - "update"] or \ + "update", "import", "revert"] or \ (args[0] in ["pull", "unbundle"] and \ ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Fri Sep 09 19:15:06 2011 +0200 @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter data for the Mercurial import command. +""" + +from PyQt4.QtCore import pyqtSlot, QDateTime +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from E5Gui import E5FileDialog +from E5Gui.E5Completers import E5FileCompleter + +from .Ui_HgImportDialog import Ui_HgImportDialog + +import Utilities + + +class HgImportDialog(QDialog, Ui_HgImportDialog): + """ + Class implementing a dialog to enter data for the Mercurial import command. + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.__patchFileCompleter = E5FileCompleter(self.patchFileEdit) + + self.__initDateTime = QDateTime.currentDateTime() + self.dateEdit.setDateTime(self.__initDateTime) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.patchFileEdit.text() == "": + enabled = False + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(str) + def on_patchFileEdit_textChanged(self, txt): + """ + Private slot to react on changes of the patch file edit. + + @param txt contents of the line edit (string) + """ + self.__updateOK() + + @pyqtSlot() + def on_patchFileButton_clicked(self): + """ + Private slot called by pressing the file selection button. + """ + fn = E5FileDialog.getOpenFileName( + self, + self.trUtf8("Select patch file"), + self.patchFileEdit.text(), + self.trUtf8("Patch Files (*.diff *.patch);;All Files (*)")) + + if fn: + self.patchFileEdit.setText(Utilities.toNativeSeparators(fn)) + + def getParameters(self): + """ + Public method to retrieve the import data. + + @return tuple naming the patch file, a flag indicating to not commit, + a commit message, a commit date, a commit user, a strip count and + a flag indicating to enforce the import + (string, boolean, string, string, string, integer, boolean) + """ + if self.dateEdit.dateTime() != self.__initDateTime: + date = self.dateEdit.dateTime().toString("yyyy-MM-dd hh:mm") + else: + date = "" + + return (self.patchFileEdit.text(), self.noCommitCheckBox.isChecked(), + self.messageEdit.toPlainText(), date, self.userEdit.text(), + self.stripSpinBox.value(), self.forceCheckBox.isChecked())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui Fri Sep 09 19:15:06 2011 +0200 @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgImportDialog</class> + <widget class="QDialog" name="HgImportDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>374</height> + </rect> + </property> + <property name="windowTitle"> + <string>Import Patch</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="2"> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Commit data</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="noCommitCheckBox"> + <property name="toolTip"> + <string>Select to not commit the imported patch</string> + </property> + <property name="text"> + <string>Do not commit</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Commit message:</string> + </property> + </widget> + </item> + <item> + <widget class="QPlainTextEdit" name="messageEdit"> + <property name="toolTip"> + <string>Enter the commit message or leave empty to use the default one</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Commit Date:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QDateTimeEdit" name="dateEdit"> + <property name="toolTip"> + <string>Enter optional date for the commit</string> + </property> + <property name="displayFormat"> + <string notr="true">yyyy-MM-dd HH:mm</string> + </property> + <property name="calendarPopup"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Commit User:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="userEdit"> + <property name="toolTip"> + <string>Enter optional user for the commit</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Strip Count:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QSpinBox" name="stripSpinBox"> + <property name="toolTip"> + <string>Enter number of leading directories to strip off (default 1)</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="maximum"> + <number>9</number> + </property> + <property name="value"> + <number>1</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>118</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Patch File:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLineEdit" name="patchFileEdit"> + <property name="toolTip"> + <string>Enter the name of the patch file</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="patchFileButton"> + <property name="toolTip"> + <string>Press to select the patch file via a file selection dialog</string> + </property> + <property name="text"> + <string notr="true">...</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="forceCheckBox"> + <property name="toolTip"> + <string>Select to enforce the import</string> + </property> + <property name="text"> + <string>Enforce Import</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>noCommitCheckBox</tabstop> + <tabstop>messageEdit</tabstop> + <tabstop>dateEdit</tabstop> + <tabstop>userEdit</tabstop> + <tabstop>stripSpinBox</tabstop> + <tabstop>patchFileEdit</tabstop> + <tabstop>patchFileButton</tabstop> + <tabstop>forceCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgImportDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgImportDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Sep 09 12:29:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Sep 09 19:15:06 2011 +0200 @@ -626,7 +626,7 @@ """ available/selected.""")) return - self.vcs.vcsRevert(names) + self.vcs.hgRevert(names) self.on_refreshButton_clicked() project = e5App().getObject("Project") @@ -647,7 +647,7 @@ """ available/selected.""")) return - self.vcs.vcsRevert(names) + self.vcs.hgRevert(names) self.on_refreshButton_clicked() self.vcs.checkVCSStatus()
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Sep 09 12:29:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Sep 09 19:15:06 2011 +0200 @@ -239,7 +239,7 @@ self.vcsMenuActions.append(self.annotateAct) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Revert changes'), self._VCSRevert) + self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) self.vcsMenuActions.append(act) @@ -309,7 +309,7 @@ self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Revert changes'), self._VCSRevert) + self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) self.vcsMultiMenuActions.append(act) @@ -420,7 +420,7 @@ self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Revert changes'), self._VCSRevert) + self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) self.vcsDirMenuActions.append(act) @@ -488,7 +488,7 @@ self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), - self.trUtf8('Revert changes'), self._VCSRevert) + self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) self.vcsDirMultiMenuActions.append(act) @@ -511,6 +511,19 @@ # Menu handling methods below ############################################################################ + def __HgRevert(self): + """ + Protected slot called by the context menu to revert changes made. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + self.vcs.hgRevert(names) + def __HgCopy(self): """ Private slot called by the context menu to copy the selected file.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Sep 09 12:29:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Sep 09 19:15:06 2011 +0200 @@ -369,7 +369,7 @@ """<b>Revert changes</b>""" """<p>This reverts all changes made to the local project.</p>""" )) - self.vcsRevertAct.triggered[()].connect(self._vcsRevert) + self.vcsRevertAct.triggered[()].connect(self.__hgRevert) self.actions.append(self.vcsRevertAct) self.vcsMergeAct = E5Action(self.trUtf8('Merge'), @@ -822,6 +822,19 @@ )) self.hgServeAct.triggered[()].connect(self.__hgServe) self.actions.append(self.hgServeAct) + + self.hgImportAct = E5Action(self.trUtf8('Import Patch'), + self.trUtf8('Import Patch...'), + 0, 0, self, 'mercurial_import') + self.hgImportAct.setStatusTip(self.trUtf8( + 'Import a patch from a patch file' + )) + self.hgImportAct.setWhatsThis(self.trUtf8( + """<b>Import Patch</b>""" + """<p>This imports a patch from a patch file into the project.</p>""" + )) + self.hgImportAct.triggered[()].connect(self.__hgImport) + self.actions.append(self.hgImportAct) def initMenu(self, menu): """ @@ -871,6 +884,11 @@ bundleMenu.addAction(self.hgUnbundleAct) self.subMenus.append(bundleMenu) + patchMenu = QMenu(self.trUtf8("Patch Management"), menu) + patchMenu.setTearOffEnabled(True) + patchMenu.addAction(self.hgImportAct) + self.subMenus.append(patchMenu) + bisectMenu = QMenu(self.trUtf8("Bisect"), menu) bisectMenu.setTearOffEnabled(True) bisectMenu.addAction(self.hgBisectGoodAct) @@ -907,6 +925,7 @@ menu.addAction(self.hgPushAct) menu.addSeparator() menu.addMenu(bundleMenu) + menu.addMenu(patchMenu) menu.addSeparator() menu.addMenu(self.__extensionsMenu) menu.addSeparator() @@ -1223,3 +1242,29 @@ Private slot used to serve the project. """ self.vcs.hgServe(self.project.ppath) + + def __hgImport(self): + """ + Private slot used to import a patch file. + """ + shouldReopen = self.vcs.hgImport(self.project.ppath) + if shouldReopen: + res = E5MessageBox.yesNo(self.parent(), + self.trUtf8("Import Patch"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgRevert(self): + """ + Private slot used to revert changes made to the local project. + """ + shouldReopen = self.vcs.hgRevert(self.project.ppath) + if shouldReopen: + res = E5MessageBox.yesNo(self.parent(), + self.trUtf8("Revert Changes"), + self.trUtf8("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject()
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Sep 09 12:29:45 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Sep 09 19:15:06 2011 +0200 @@ -48,6 +48,7 @@ from .HgServeDialog import HgServeDialog from .HgUtilities import getConfigPath from .HgClient import HgClient +from .HgImportDialog import HgImportDialog from .BookmarksExtension.bookmarks import Bookmarks from .QueuesExtension.queues import Queues @@ -829,11 +830,13 @@ if res: dia.exec_() - def vcsRevert(self, name): + def hgRevert(self, name): """ Public method used to revert changes made to a file/directory. @param name file/directory name to be reverted (string) + @return flag indicating, that the update contained an add + or delete (boolean) """ args = [] args.append('revert') @@ -852,13 +855,15 @@ while not os.path.isdir(os.path.join(repodir, self.adminDir)): repodir = os.path.dirname(repodir) if repodir == os.sep: - return + return False dia = HgDialog(self.trUtf8('Reverting changes'), self) res = dia.startProcess(args, repodir) if res: dia.exec_() + res = dia.hasAddOrDelete() self.checkVCSStatus() + return res def vcsMerge(self, name): """ @@ -1592,7 +1597,7 @@ while not os.path.isdir(os.path.join(repodir, self.adminDir)): repodir = os.path.dirname(repodir) if repodir == os.sep: - return + return False dia = HgDialog(title, self) res = dia.startProcess(args, repodir) @@ -2369,6 +2374,61 @@ self.serveDlg = HgServeDialog(self, repodir) self.serveDlg.show() + def hgImport(self, name): + """ + Public method to import a patch file. + + @param name directory name of the project to import into (string) + @return flag indicating, that the import contained an add, a delete + or a change to the project file (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if repodir == os.sep: + return + + dlg = HgImportDialog() + if dlg.exec_() == QDialog.Accepted: + patchFile, noCommit, message, date, user, stripCount, force = \ + dlg.getParameters() + + args = [] + args.append("import") + args.append("--verbose") + if noCommit: + args.append("--no-commit") + else: + if message: + args.append('--message') + args.append(message) + if date: + args.append('--date') + args.append(date) + if user: + args.append('--user') + args.append(user) + if stripCount != 1: + args.append("--strip") + args.append(str(stripCount)) + if force: + args.append("--force") + args.append(patchFile) + + dia = HgDialog(self.trUtf8("Import Patch"), self) + res = dia.startProcess(args, repodir) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + else: + res = False + + return res + ############################################################################ ## Methods to handle extensions are below. ############################################################################
--- a/changelog Fri Sep 09 12:29:45 2011 +0200 +++ b/changelog Fri Sep 09 19:15:06 2011 +0200 @@ -30,6 +30,7 @@ --- added code to support multiple revisions where appropriate --- modified pull such, that it will try to apply an existing changegroups file first (created by an hg incoming) + --- added support for importing patches Version 5.2-snapshot-20110724: - bug fixes
--- a/i18n/eric5_cs.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_cs.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3845,7 +3845,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Spustit skript</translation> </message> @@ -3865,7 +3865,7 @@ <translation><b>Spustit skript</b><p>Nastavení parametrů příkazové řádky a spuštění skriptu bez debugeru. Pokud jsou v souboru neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Spustit projekt</translation> </message> @@ -3965,7 +3965,7 @@ <translation><b>Profilovat projekt</b><p>Nastavení parametrů příkazové řádky a spuštění projektu s profilováním kódu. Pokud jsou v projektu neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Debugovat skript</translation> </message> @@ -3985,7 +3985,7 @@ <translation><b>Debugovat skript</b><p>Nastavení parametrů příkazové řádky a aktuální řádky jako první python příkaz v aktuálním editačním okně. Pokud jsou ve skriptu neuložené změny, měly by se nejdříve uložit.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Debugovat projekt</translation> </message> @@ -4140,7 +4140,7 @@ <translation><b>Stop</b><p>Stop běhu aktuální debug relace.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Evaluate</translation> </message> @@ -4155,7 +4155,7 @@ <translation>Vyhodnotit aktuální kontext</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Vykonat</translation> </message> @@ -4323,52 +4323,52 @@ <translation>Objevila se neošetřená výjimka. Detaily naleznete v shell okně.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Debugovaný program byl neočekávaně ukončen.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Chyba v podmíněném breakpointu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Pokrytí projektu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Pokrytí skriptu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu není definován hlavní skript. Zrušeno</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profilovat projekt</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profilovat skript</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>V aktuálním projektu není definován hlavní skript. Debugování není možné.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Zadejte příkaz pro vyhodnocení</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Zadejte příkaz pro vykonání</translation> </message> @@ -4393,12 +4393,12 @@ <translation><b>Vyhodnotit</b><p>Vyhodnotit výraz aktuálního kontextu debugovaného programu. Výsledek je zobrazen v shell okně.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Chyba sledovacího bodu</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>Sledovací bod již existuje</translation> </message> @@ -4450,32 +4450,32 @@ <translation><p>Soubor <b>{0}</b> na řádce <b>{1}</b>, písmeno <b>{2}</b>, obsahuje syntaktickou chybu <b>{3}</b>.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Debugovaný program vyvolal výjimku <b>{0}</b><br>"<b>{1}</b>"<br>Soubor: <b>{2}</b>, řádek: <b>{3}</b></p><p>Zastavit zde?</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Debugovaný program vyvolal výjimku <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>Podmínka breakpointu <b>{0}, {1}</b> obsahuje syntaktickou chybu.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>Sledovací bod <b>{0}</b> obsahuje syntaktickou chybu.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Sledovací bod '<b>{0}</b>' již existuje.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Sledovací bod '<b>{0}</b>' pro proměnnou <b>{1}</b> již existuje.</p></translation> </message> @@ -15634,42 +15634,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15679,47 +15679,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="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <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="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -15734,112 +15734,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <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="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15849,60 +15849,65 @@ <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="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <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="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17266,6 +17271,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Zapsat změny</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Zpráva zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Zadejte zprávu pro zápis změn (commit) nebo ponechte prázdné pro použití výhozí hodnoty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Datum zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Zadejte nepovinné datum pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Autor zápisu změn:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Zadejte nepovinného uživatele pro zápis změn (commit)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -18125,17 +18228,17 @@ <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> @@ -18828,7 +18931,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="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> @@ -18863,7 +18966,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="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> @@ -18878,7 +18981,7 @@ <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> @@ -18968,7 +19071,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="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -19093,17 +19196,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -19138,7 +19241,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19217,6 +19320,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -40170,7 +40303,7 @@ <translation>Stisknout pro zobrazení všech souborů, které obsahují problém</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Žádné problémy nenalezeny.</translation> </message> @@ -45627,17 +45760,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Můžete použít %-kódy a rezervovaná místa ve stringu. Podporované kódy jsou:<table><tr> <td>%C</td> <td>sloupec kurzoru v aktuálním editoru</td></tr><tr> <td>%D</td> <td>adresář v aktuálním editoru</td></tr><tr> <td>%F</td> <td>jméno souboru v aktuálním editoru</td></tr><tr> <td>%H</td> <td>home adresář aktuálního uživatele</td></tr><tr> <td>%L</td> <td>řádek s kurzorem v aktuálním editoru</td></tr><tr> <td>%P</td> <td>cesta aktuálního projektu</td></tr><tr> <td>%S</td> <td>vybraný text v aktuálním editoru</td></tr><tr> <td>%U</td> <td>uživatelské jméno aktuálního uživatele</td></tr><tr> <td>%%</td> <td>znak procenta</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -49649,30 +49782,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49683,23 +49816,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="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49707,7 +49840,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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_de.ts Fri Sep 09 19:15:06 2011 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -3821,7 +3820,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Skript ausführen</translation> </message> @@ -3836,7 +3835,7 @@ <translation>Das aktuelle Skript ausführen</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Projekt ausführen</translation> </message> @@ -3966,37 +3965,37 @@ <translation>Eine nicht abgefangene Ausnahme ist aufgetreten. Details finden Sie im Shell-Fenster.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Das untersuchte Programm wurde unerwartet beendet.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Projekt debuggen</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>Das aktuelle Projekt besitzt kein Hauptskript. Debuggen ist nicht möglich.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Auswerten</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Gebe die auszuwertende Anweisung ein</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Einzelanweisung ausführen</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Gebe die auszuführende Anweisung ein</translation> </message> @@ -4056,7 +4055,7 @@ <translation><b>Skript ausführen</b><p>Bestimme die Kommandozeilenparameter und führe das Skript auserhalb des Debuggers aus. Falls die Datei ungesicherte Änderungen hat, so können diese zunächst gesichert werden.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Debug Skript</translation> </message> @@ -4091,7 +4090,7 @@ <translation><b>Projekt debuggen</b><p>Bestimme die Kommandozeilenparameter und setze die erste ausführbare Python Zeile des Hauptskriptes des aktuellen Projektes als aktuelle Zeile. Falls Dateien des aktuellen Projektes ungesicherte Änderungen haben, so können diese zunächst gesichert werden.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation> </message> @@ -4141,12 +4140,12 @@ <translation><b>Abdeckungslauf des Projektes</b><p>Bestimme die Kommandozeilenparameter und führe das Hauptskript des aktuellen Projektes unter Kontrolle eines Abdeckungsanalysetools aus. Falls Dateien des aktuellen Projektes ungesicherte Änderungen haben, so können diese zunächst gesichert werden.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Abdeckung des Projektes</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Abdeckung des Skriptes</translation> </message> @@ -4191,12 +4190,12 @@ <translation><b>Projektprofil</b><p>Bestimme die Kommandozeilenparameter und führe das Hauptskript des aktuellen Projektes unter Kontrolle des Python Profilers aus. Falls Dateien des aktuellen Projektes ungesicherte Änderungen haben, so können diese zunächst gesichert werden.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Projektprofil</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Skriptprofil</translation> </message> @@ -4306,7 +4305,7 @@ <translation><p><b>{0}</b> wurde mit dem Status {1} beendet.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Das untersuchte Programm erzeugte die Ausnahme <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> @@ -4316,12 +4315,12 @@ <translation><p>Das Programm wurde mit dem Status {0} beendet.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Fehler in Haltepunkt Bedingung</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>Die Bedingung des Haltepunktes <b>{0}, {1}</b> enthält einen Syntaxfehler.</p></translation> </message> @@ -4364,7 +4363,7 @@ <translation>Debug</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Das untersuchte Programm erzeugte die Ausnahme <b>{0}</b><br>"<b>{1}</b>"<br>Datei: <b>{2}</b>, Zeile: <b>{3}</b></p><p>Anhalten?</p></translation> </message> @@ -4394,27 +4393,27 @@ <translation><b>Auswerten</b><p>Wertet einen Ausdruck im aktuellen Kontext des debuggten Programmes aus. Das Resultat wird im Shell-Fenster angezeigt.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Fehler in Beobachtungsausdruck</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>Der Beobachtungsausdrucks <b>{0}</b> enthält einen Syntaxfehler.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Ein Beobachtungsausdruck '<b>{0}</b>' existiert bereits.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Ein Beobachtungsausdruck '<b>{0}</b>' für die Variable <b>{1}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>Beaobachtungsausdruck existiert bereits</translation> </message> @@ -12589,7 +12588,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <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> @@ -15286,255 +15285,260 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <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="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <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="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <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="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <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="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation>Patch importieren</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16872,6 +16876,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation>Patch importieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation>Änderungsdaten</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation>Auswählen, um den importierten Patch nicht einzupflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation>Nicht einpflegen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation>Änderungsbeschreibung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation>Gib die Änderungsbeschreibung ein oder lasse es leer, um den Standardtext zu verwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation>Datum für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation>Gib das optionale Datum der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation>Nutzer für Änderung:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation>Gib den optionalen Nutzer der Änderung ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation># Löschungen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation>Gib die Anzahl an führenden Verzeichnissen, die gelöscht werden sollen, ein (Standard 1)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation>Patchdatei:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation>Gib den namen einer Patchdatei ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation>Drücken, um die Patchdatei mit einem Dateiauswahldialog auszuwählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation>Auswählen, um den Import zu erzwingen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation>Erzwinge Import</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation>Patchdatei auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation>Patchdateien (*.diff *.patch);;Alle Dateien (*)</translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17735,17 +17837,17 @@ <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Nur vom Repository löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> @@ -18383,7 +18485,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="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> @@ -18418,7 +18520,7 @@ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> @@ -18433,7 +18535,7 @@ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> @@ -18513,7 +18615,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="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18618,7 +18720,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="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> @@ -18643,12 +18745,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="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -18683,7 +18785,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="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> @@ -18762,6 +18864,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation>Patch importieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation>Patch importieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation>Einen Patch aus einer Patchdatei importieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation>Verwaltung von Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation>Änderungen rückgängig machen</translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39491,7 +39623,7 @@ <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> @@ -44875,17 +45007,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Sie können %-Codes als Platzhalter in der Eingabe verwenden. Unterstützte Codes sind:<table><tr><td>%C</td><td>Spalte des Cursor des aktuellen Editors</td></tr><tr><td>%D</td><td>Verzeichnis des aktuellen Editors</td></tr><tr><td>%F</td><td>Dateiname des aktuellen Editors</td></tr><tr><td>%H</td><td>Home-Verzeichnis des aktullen Nutzers</td></tr><tr><td>%L</td><td>Zeile des Cursor des aktuellen Editors</td></tr><tr><td>%P</td><td>Pfad des aktuellen Projektes</td></tr><tr><td>%S</td><td>selektierter Text des aktuellen Editors</td></tr><tr><td>%U</td><td>Nutzername des aktuellen Nutzers</td></tr><tr><td>%%</td><td>das Prozentzeichen</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python2 Interpreter konfiguriert.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Python2 Interpreter wurde nicht innerhalb von 30s beendet.</translation> </message> @@ -48791,24 +48923,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -48817,7 +48949,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48834,24 +48966,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -48862,7 +48994,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_en.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3781,7 +3781,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> @@ -3801,7 +3801,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation type="unfinished"></translation> </message> @@ -3901,7 +3901,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation type="unfinished"></translation> </message> @@ -3921,7 +3921,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation type="unfinished"></translation> </message> @@ -4091,7 +4091,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation type="unfinished"></translation> </message> @@ -4111,7 +4111,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation type="unfinished"></translation> </message> @@ -4326,92 +4326,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation type="unfinished"></translation> </message> @@ -15201,255 +15201,260 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16776,6 +16781,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17553,7 +17656,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> @@ -17628,12 +17731,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -18396,7 +18499,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -18511,32 +18614,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -18571,7 +18674,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -18650,6 +18753,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39131,7 +39264,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -44446,17 +44579,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -48356,30 +48489,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> - <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="1706"/> + <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="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48390,31 +48523,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1718"/> + <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="1721"/> + <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> +</table></p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> - <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="1713"/> - <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> -</table></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_es.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3834,7 +3834,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Ejecutar Script</translation> </message> @@ -3854,7 +3854,7 @@ <translation><b>Ejecutar Script</b><p>Establece los parámetros de la línea de comandos y ejecuta el script fuera del depurador. Si tiene cambios sin guardar, deben ser guardados primero.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Ejecutar Proyecto</translation> </message> @@ -3954,7 +3954,7 @@ <translation><b>Hacer Profiling del Proyecto</b><p>Establecer los argumentos de línea de comandos y hacer profiling del proyecto actual. Si hay archivos que tienen cambios sin guardar, se puede guardar primero.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Depurar Script</translation> </message> @@ -3974,7 +3974,7 @@ <translation><b>Depurar Script</b><p>Establecer los argumentos de línea de comandos y establecer la línea actual en la ventana actual de edición como la primera sentencia Python ejecutable. Si el archivo tiene cambios sin guardar, se puede guardar primero.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Depurar proyecto</translation> </message> @@ -4144,7 +4144,7 @@ <translation><b>Detener</b><p>Detener la sesión de depuración en ejecución.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Evaluar</translation> </message> @@ -4159,7 +4159,7 @@ <translation>Evaluar en el contexto actual</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Ejecutar</translation> </message> @@ -4327,52 +4327,52 @@ <translation>Ha saltado una excepción que no ha sido manejada. Vea la ventana de shell para mas detalles.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>El programa en depuración ha terminado inesperadamente.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Error en la condición del Breakpoint</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Cobertura del Proyecto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Cobertura del Script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>No hay script principal definido para el proyecto actual. Abortando</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profiling del proyecto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profiling del script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>No hay script principal definido para el proyecto actual. La depuración no es posible.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Introduzca la sentencia a evaluar</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Introduzca la sentencia a ejecutar</translation> </message> @@ -4382,12 +4382,12 @@ <translation><b>Evaluar</b><p>Evaluar una expresión en el contexto actual del programa en depuración. El resultado se muestra en la ventana de shell.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Error en la Expresión a Examinar</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>La expresión a Examinar ya existe</translation> </message> @@ -4439,32 +4439,32 @@ <translation><p>El archivo <b>{0}</b> contiene el error de sintaxis <b>{1}</b> en la línea<b>{2}</b>, carácter <b>{4}</b>.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>El programa en depuración ha lanzado la excepción <b>{0}</b><br>"<b>{1}</b>"<br>Archivo: <b>{2}</b>, Línea: <b>{3}</b></p><p>¿Interrumpir aquí?</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>El programa en depuración ha lanzado la excepción <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>La condición del punto de ruptura <b>{0},{1}</b> tiene un error de sintaxis.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>La expresión a examinar <b>{0}</b> contiene un error de sintaxis.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Una expresión a examinar '<b>{0}</b>' ya existe.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Una expresión a examinar '<b>{0}</b>' para la variable <b>{1}</b> ya existe.</p></translation> </message> @@ -15456,42 +15456,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> @@ -15501,32 +15501,32 @@ <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> @@ -15541,185 +15541,190 @@ <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <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="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <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="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17087,6 +17092,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Hacer commit de los datos</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Mensaje de commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Introduzca el mensaje de commit o deje en blanco para utilizar el mensaje por defecto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Fecha de Commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Introduzca opcionalmente fecha para el commit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Usuario de Commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Introduzca opcionalmente usuario para el commit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17956,17 +18059,17 @@ <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Eliminar solamente del repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos de traducción del repositorio?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> @@ -18674,7 +18777,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="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> @@ -18694,7 +18797,7 @@ <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> @@ -18709,7 +18812,7 @@ <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> @@ -18799,7 +18902,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="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18904,7 +19007,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="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation>Especial</translation> </message> @@ -18929,12 +19032,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="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -18969,7 +19072,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="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation>Extensiones</translation> </message> @@ -19048,6 +19151,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39771,7 +39904,7 @@ <translation>Pulsar para mostrar todos los archivos con algún problema</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> @@ -45205,17 +45338,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puede utilizar %-códigos como marcadores en la cadena. Los valores sportados son:<table><tr><td>%C</td><td>columna del cursos en el editor actual</td></tr><tr><td>%D</td><td>directorio del editor actual</td></tr><tr><td>%F</td><td>nombre de archivo del editor actual</td></tr><tr><td>%H</td><td>directorio home del usuario actual</td></tr><tr><td>%L</td><td>línea del cursor en el editor actual</td></tr><tr><td>%P</td><td>ruta del proyecto actual</td></tr><tr><td>%S</td><td>texto seleccionado en el editor actual</td></tr><tr><td>%U</td><td>nombre de usuario del usuario actual</td></tr><tr><td>%%</td><td>signo de porcentaje</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Intérprete de Python2 no configurado.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>El intérprete de Python2 no terminó en un plazo de 30s.</translation> </message> @@ -49125,17 +49258,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49146,31 +49279,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -49179,7 +49312,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49196,7 +49329,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_fr.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_fr.ts Fri Sep 09 19:15:06 2011 +0200 @@ -4094,7 +4094,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Lancer le script</translation> </message> @@ -4114,7 +4114,7 @@ <translation><b>Lancer le script</b><p>Entrer les arguments de la ligne de commande et lancer le script sans le débogueur. Si le script a des modifications, elles doivent d'abord être enregistrées.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Lancer le projet</translation> </message> @@ -4254,7 +4254,7 @@ <translation type="obsolete"><b>Lancement du projet avec Cyclops</b><p>Entrer les arguments de la ligne de commande et lancer le projet avec Cyclops. Si des fichiers ont été modifiés, ils doivent d'abord être sauvés.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Déboguer le script</translation> </message> @@ -4274,7 +4274,7 @@ <translation><b>Deboguer le script</b><p>Entrer les arguments de la ligne de commande et donner la ligne qui correspond à la première instruction Python. Si le fichier a été modifié, il doit d'abord être sauvé.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Déboguer le projet</translation> </message> @@ -4409,7 +4409,7 @@ <translation><b>Arrêt</b><p>Arrête le débogage courant.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Evaluer</translation> </message> @@ -4424,7 +4424,7 @@ <translation>Evalue l'expression dans le contexte en cours</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Exécuter</translation> </message> @@ -4534,32 +4534,32 @@ <translation>Une erreur imprévue est apparue. Regardez les détails dans la fenêtre shell.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Le programme débogué s'est terminé de façon prématurée.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Coverage du projet</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Coverage du Script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profil du projet</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profil du Script</translation> </message> @@ -4579,17 +4579,17 @@ <translation type="obsolete">Erreur Cyclops</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>Il n'y a pas de script principal défini dans le projet en cours. Débogage impossible.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Entrer une instruction à évaluer</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Entrer une instruction à exécuter</translation> </message> @@ -4654,7 +4654,7 @@ <translation type="obsolete"><p>Le programme s'est terminé avec le code de sortie %1.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Erreur de condition pour le point d'arrêt</translation> </message> @@ -4732,7 +4732,7 @@ <translation><b>Evaluer</b><p>Evalue une expression dans le contexte courant du programme débogué. Le résultat est affiché dans la fenêtre Shell</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Erreur dans l'expression</translation> </message> @@ -4752,7 +4752,7 @@ <translation type="obsolete"><p>L'expression '<b>%1</b>' pour la variable <b>%2</b> existe déjà.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>L'expression existe déjà</translation> </message> @@ -4804,32 +4804,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> @@ -16786,87 +16786,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16876,170 +16876,175 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18385,6 +18390,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -19268,17 +19371,17 @@ <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -19931,7 +20034,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -19966,7 +20069,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19981,7 +20084,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20061,7 +20164,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20166,7 +20269,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20191,12 +20294,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20231,7 +20334,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20310,6 +20413,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -43309,7 +43442,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -49341,17 +49474,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Vous pouvez utiliser la syntaxe "%-code" dans la chaine de caractères. Les codes supportés sont :<table><tr><td>%C</td><td>colonne du curseur de l'éditeur courant</td></tr><tr><td>%D</td><td>répertoire de l'éditeur courant</td></tr><tr><td>%F</td><td>nom de fichier de l'éditeur courant</td></tr><tr><td>%H</td><td>répertoire 'home' de l'utilisateur courant</td></tr><tr><td>%L</td><td>ligne du curseur de l'éditeur courant</td></tr><tr><td>%P</td><td>chemin du projet courant</td></tr><tr><td>%S</td><td>texte sélectionné dans l'éditeur courant</td></tr><tr><td>%U</td><td>nom d'utilisateur de l'utilisateur courant</td></tr><tr><td>%%</td><td>le signe pourcent</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -53573,30 +53706,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> - <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="1706"/> + <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="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53607,31 +53740,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1718"/> + <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="1721"/> + <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> +</table></p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> - <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="1713"/> - <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> -</table></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_it.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3834,7 +3834,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Esegui Script</translation> </message> @@ -3854,7 +3854,7 @@ <translation><b>Esegui Script</b><p>Imposta gli argomenti della linea di comando ed esegue lo script al di fuori del debugger. Se il file non è stato salvato può essere salvato prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Esegui Progetto</translation> </message> @@ -3954,7 +3954,7 @@ <translation><b>Profila Progetto</b><p>Imposta gli argomenti della linea di comando e profila il progetto. Se file del progetto corrente non sono stati salvati, è possibile salvarli prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Debug dello script</translation> </message> @@ -3974,7 +3974,7 @@ <translation><b>Debug dello Script</b><p>Imposta gli argomenti della linea di comando e imposta la linea corrente per essere la prima istruzione eseguibile di Python della finestra dell'editor. Se il file ha modifiche non salvate è possibile salvarle prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Debug del Progetto</translation> </message> @@ -4109,7 +4109,7 @@ <translation><b>Stop</b><p>Ferma la sessione di debug.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Valuta</translation> </message> @@ -4124,7 +4124,7 @@ <translation>Valuta nel contesto corrente</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Esegui</translation> </message> @@ -4234,47 +4234,47 @@ <translation>Un'eccezione non gestita è occorso. Guarda la finestra di shell per dettagli.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Il programma debuggato è terminato in maniera inaspettata.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Analisi del Progetto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Analisi delle Script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Non c'è uno script principale definito per il progetto. Esco</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profilazione del progetto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profilazione dello script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>Non c'è uno script principale per il progetto. Non è possibile il debug.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Inserisci l'istruzione da valutare</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Inserisci l'istruzione da eseguire</translation> </message> @@ -4319,7 +4319,7 @@ <translation><b>Filtro tipo variabili</b><p>Configura il filtro per i tipi variabile. Solo i tipi di variabile che non sono selezionati sono mostrati nella finestra delle variabili globali o locali durante una sessione di debug. </p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Errore condizione di interruzione</translation> </message> @@ -4382,12 +4382,12 @@ <translation><b>Valuta</b><p>Valuta un'espressione nel contesto corrente del programma debuggato. Il risultato è mostrato nella shell.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Errore espressione di watch</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>L'espressione di controllo esiste già</translation> </message> @@ -4439,32 +4439,32 @@ <translation><p>Il file <b>{0}</b> contiene l'errore di sintassi <b>{1}</b> alla linea <b>{2}</b>, carattere <b>{3}</b>.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Il programma in debug ha sollevato un'eccezione <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Linea: <b>{3}</b></p><p>Interrompere qui ?</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Il programma debuggato ha sollevato un'eccezione <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>La condizione del breakpoint <b>{0}, {1}</b> contiene un errore di sintassi.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>L'espressione <b>{0}</b> contiene un errore di sintassi.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>L'espressione '<b>{0}</b>' esiste già.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>L'espressione '<b>{0}</b>' per la variabile <b>{1}</b> esiste già.</p></translation> </message> @@ -15395,42 +15395,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -15440,47 +15440,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -15495,170 +15495,175 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <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="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <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="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17022,6 +17027,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Commit dei dati</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Messaggio di commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Inserisci il messaggio per la commit o lascia vuoto per usare quello di default</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Data della commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Inserisci formato data opzionale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Utente della commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Inserisci utente per la commit opzionale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17890,17 +17993,17 @@ <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Vuoi veramente rimuovere questi file di traduzione dal repository ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> @@ -18593,7 +18696,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -18628,7 +18731,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -18643,7 +18746,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -18733,7 +18836,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18858,17 +18961,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="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -18903,7 +19006,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -18982,6 +19085,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39691,7 +39824,7 @@ <translation>Premi per mostrare tutti i file che contengono errori di sintassi</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Nessun problema trovato.</translation> </message> @@ -45117,17 +45250,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puoi usare i codici % come segnaposti nella stringa. I codici supportati sono: <table><tr><td>%C</td><td>colonna del cursore nell'editor attuale</td></tr><tr><td>%D</td><td>directory dell'editor attuale</td></tr><tr><td>%F</td><td>nome file dell'editor corrente</td></tr><tr><td>%H</td><td>directory home dell'utente attuale</td></tr><tr><td>%L</td><td>linea del cursore dell'editor attuale</td></tr><tr><td>%P</td><td>percorso del progetto attuale</td></tr><tr><td>%S</td><td>testo selezionato dell'editor attuale</td></tr><tr><td>%U</td><td>username dell'utente attuale</td></tr><tr><td>%%</td><td>Segno percentuale</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Interprete Python2 non configurato.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>L'interprete Python2 non ha finito entro i 30s.</translation> </message> @@ -49038,24 +49171,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -49064,7 +49197,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49081,24 +49214,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49108,7 +49241,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_ru.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3842,7 +3842,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Выполнить сценарий</translation> </message> @@ -3863,7 +3863,7 @@ <p>Задайте аргументы и выполните сценарий без отладки. Если файл не был сохранён, изменения можно предварительно сохранить.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Выполнить проект</translation> </message> @@ -3968,7 +3968,7 @@ <p>Задайте аргументы и запустите проект на профилирование. Если файлы проекта не были сохранёны, изменения можно предварительно сохранить.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Отладить сценарий</translation> </message> @@ -3989,7 +3989,7 @@ <p>Задайте аргументы командной строки и запустите сценарий на отладку. Если файл не был сохранён, изменения можно предварительно сохранить.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Отладить проект</translation> </message> @@ -4184,57 +4184,57 @@ Более точная информация в окне консоли.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Отлаживаемая программа была неожиданно прервана.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Охват проекта</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Охват сценария</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Профиль проекта</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Профиль сценария</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>Для текущего проекта не определён главный сценарий. Отладка невозможна.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Вычислить</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Задайте выражение для вычисления</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Выполнить</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Задайте выражение для выполнения</translation> </message> @@ -4353,7 +4353,7 @@ <translation><p><b>{0}</b> завершился с кодом выхода {1}.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Отлаживаемая программа выбросила исключение <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> @@ -4363,12 +4363,12 @@ <translation><p>Программа завершилась с кодом выхода {0}.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Ошибка в условиях точки останова</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>Условие точки останова <b>{0}, {1}</b> содержит синтаксическую ошибку.</p></translation> </message> @@ -4411,7 +4411,7 @@ <translation>Отладка</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Отлаживаемая программа выбросила исключение <b>{0}</b><br>"<b>{1}</b>"<br>Файл: <b>{2}</b>, строка <b>{3}</b></p><p>Прервать выполнение в этом месте?</p></translation> </message> @@ -4441,27 +4441,27 @@ <translation><b>Вычислить</b><p>Вычислить выражение в текущем контексте отлаживаемой программы. Результат будет отображен в окне интерпретатора.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Ошибка в выражении для отслеживания</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>Выражение для отслеживания <b>{0}</b> содержит синтаксическую ошибку.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>Выражение для отслеживания '<b>{0}</b>' уже существует.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>Выражение отслеживания '<b>{0}</b>' для переменной <b>{1}</b> уже существует.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>Выражение для отслеживания уже существует</translation> </message> @@ -15502,42 +15502,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -15547,32 +15547,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -15587,185 +15587,190 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17124,6 +17129,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Подать данные</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Описание изменений:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Введите описание изменений, иначе будет использовано описание по умолчанию</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Дата подачи:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Введите дату подачи</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Автор подачи:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Введите автора подачи</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17997,17 +18100,17 @@ <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> @@ -18700,7 +18803,7 @@ <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> @@ -18735,7 +18838,7 @@ <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> @@ -18750,7 +18853,7 @@ <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> @@ -18840,7 +18943,7 @@ <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> @@ -18945,7 +19048,7 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation>Специфический</translation> </message> @@ -18970,12 +19073,12 @@ <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -19010,7 +19113,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19089,6 +19192,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39861,7 +39994,7 @@ <translation>Показать все файлы, содержащие синтаксические ошибки</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Синтаксисические ошибки не найдены.</translation> </message> @@ -45316,7 +45449,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>В строках вы можете использовать следующие %-коды:: <table> @@ -45331,12 +45464,12 @@ <tr><td>%%</td><td>знак процента</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation> </message> @@ -49287,17 +49420,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49308,30 +49441,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -49341,7 +49474,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49358,7 +49491,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_tr.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3844,7 +3844,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Betiği Çalıştır</translation> </message> @@ -3864,7 +3864,7 @@ <translation><b>Betiği Çalıştır</b><p> KOmut satırı argumanlarını ayarla ve hata ayıklayıcının dışında çalıştır. Eğer dosyada kaydedilmemiş değişiklikler varsa önce kaydedilmelidir.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Projeyi Çalıştır</translation> </message> @@ -3964,7 +3964,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Betik Hata Ayıklama</translation> </message> @@ -3984,7 +3984,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Proje Hata Ayıklama</translation> </message> @@ -4154,7 +4154,7 @@ <translation><b>Dur</b><p>Çalışan hata ayıklama oturumunu durdur.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Değerlendir</translation> </message> @@ -4174,7 +4174,7 @@ <translation><b>Değerlendirme</b><p>Hata ayıklaması yapılan program metni içinde geçenr ifadeleri değerlendir. Sonuç kabuk penceresinde gösterilir.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Gerçekleştir</translation> </message> @@ -4389,92 +4389,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Hata ayıklanmaya başlanan program beklenmeyen bir şekilde sonlandı.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Gözetleme İfade hatası</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>Hali hazırda gözetleme ifadesi var</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Proje Kapsamı</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Betik Kapsamı</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Proje Kesiti</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Betik Kesiti</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Değerlendilecek ifadeleri giriniz</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Çalıştırılacak ifadeleri giriniz</translation> </message> @@ -15635,87 +15635,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -15730,170 +15730,175 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <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="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17254,6 +17259,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Teslim edilece veri</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Teslimat mesajı:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Teslimat Tarihi:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Teslimat kullanıcısı (alıcı):</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -18037,7 +18140,7 @@ <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> @@ -18117,12 +18220,12 @@ <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Gerçekten bu çeviri dosyalarını kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> @@ -18875,7 +18978,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -18970,17 +19073,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -19020,17 +19123,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -19065,7 +19168,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -19144,6 +19247,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39943,7 +40076,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Sorun bulunamadı.</translation> </message> @@ -45374,17 +45507,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>%-alanlarda çeşitli kodları kullanabilirsiniz. Tanımlanan kodlar:<table><tr><td>%C</td><td>geçerli düzenleyicinin imlecinin sütunu</td></tr><tr><td>%D</td><td>geçerli düzenleyicinin dizini</td></tr><tr><td>%F</td><td>geçerli düzenleyicinin dosya adı</td></tr><tr><td>%H</td><td>geçerli kullancının ana dizini</td></tr><tr><td>%L</td><td>geçerli düzenleyicinin imlecinin satırı</td></tr><tr><td>%P</td><td>geçerli projenin yolu</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>Geçici kullanıcının kullanıcı adı</td></tr><tr><td>%%</td><td>oran işareti</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Python2 yorumlayıcı ayarlanmadı.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished">Python2 yorumlayıcı 15 s. de bitmedi. {2 ?} {30s?}</translation> </message> @@ -49350,24 +49483,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -49376,7 +49509,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49393,23 +49526,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49420,7 +49553,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri Sep 09 19:15:06 2011 +0200 @@ -4088,7 +4088,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>运行脚本</translation> </message> @@ -4108,7 +4108,7 @@ <translation><b>运行脚本</b><p>设置命令行参数，并在调试器之外运行脚本。如果文件未对更改进行保存，则可能会先行保存。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>运行项目</translation> </message> @@ -4248,7 +4248,7 @@ <translation type="obsolete"><b>循环项目</b><p>设置命令行参数，并通过循环运行当前项目。如果当前项目的文件未保存则会先行保存。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>调试脚本</translation> </message> @@ -4268,7 +4268,7 @@ <translation><b>调试脚本</b><p>设置命令行参数，并将当前行设为当前编辑窗口首先执行的 Python 声明。如果文件未保存则会先行保存。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>调试项目</translation> </message> @@ -4438,7 +4438,7 @@ <translation><b>中止</b><p>中止正在运行中的调试会话。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>赋值</translation> </message> @@ -4458,7 +4458,7 @@ <translation><b>赋值</b><p>在调试程序的当前上下文中为表达式赋值。结果显示在命令行窗口中。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>执行</translation> </message> @@ -4671,12 +4671,12 @@ <translation type="obsolete"><p>被调试的程序导致异常 <b>%1</b><br>“<b>%2</b>”</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>被调试的程序意外终止。</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>断点条件错误</translation> </message> @@ -4686,7 +4686,7 @@ <translation type="obsolete"><p>断点 <b>%1, %2</b> 的条件中包含一个语法错误。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>监视表达式出错</translation> </message> @@ -4706,32 +4706,32 @@ <translation type="obsolete"><p> 变量 <b>%2</b> 的监视表达式 '<b>%1</b>' 已存在。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>监视表达式已存在</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>项目覆盖率</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>脚本覆盖率</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>There is no main script defined for the current project. Aborting</source> <translation>当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>项目轮廓</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>脚本轮廓</translation> </message> @@ -4756,17 +4756,17 @@ <translation type="obsolete"><p>要循环一个模块，相应模块必须定义一个函数作为循环的进入点。模块 <b>%1</b> 未定义函数 <b>%2</b>。</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>当前项目未定义主脚本。不能进行调试。</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>输入赋值语句</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>输入执行语句</translation> </message> @@ -4798,32 +4798,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> @@ -16752,87 +16752,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -16842,170 +16842,175 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -18351,6 +18356,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -19234,17 +19337,17 @@ <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> @@ -19897,7 +20000,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -19932,7 +20035,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -19947,7 +20050,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -20027,7 +20130,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20132,7 +20235,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation type="unfinished"></translation> </message> @@ -20157,12 +20260,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20197,7 +20300,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -20276,6 +20379,36 @@ <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -43279,7 +43412,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -49313,17 +49446,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>可以在字符串中使用“%-代码”作为占位符。支持的代码有：<table><tr><td>%C</td><td>当前编辑器的光标所在列</td></tr><tr><td>%D</td><td>当前编辑器的文件夹</td></tr><tr><td>%F</td><td>当前编辑器的文件名</td></tr><tr><td>%H</td><td>当前用户的根目录</td></tr><tr><td>%L</td><td>当前编辑器的光标所在行</td></tr><tr><td>%P</td><td>当前项目的路径</td></tr><tr><td>%S</td><td>当前编辑器中选择的文本</td></tr><tr><td>%U</td><td>当前用户的用户名</td></tr><tr><td>%%</td><td>百分比符号</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -53532,30 +53665,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> - <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="1706"/> + <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="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53566,31 +53699,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1718"/> + <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="1721"/> + <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> +</table></p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> - <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="1713"/> - <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> -</table></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
