Mercurial Repositories > eric / changeset
changeset
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
Sun, 04 Sep 2011 15:17:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 04 Sep 2011 15:17:10 +0200
- changeset 1274
- 442c748018c5
- parent 1269
- 7b4d9f1d7c6c
- child 1275
- 3db9193a528b
Added code to the Mercurial plug-in to support multiple revisions where appropriate.
--- a/APIs/Python3/eric5.api Sat Sep 03 17:13:31 2011 +0200 +++ b/APIs/Python3/eric5.api Sun Sep 04 15:17:10 2011 +0200 @@ -3345,8 +3345,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_bookmarkCombo_editTextChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_branchButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_branchCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_idButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_idEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_multipleButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_multipleEdit_textChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagCombo_editTextChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) @@ -3442,7 +3442,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0, revisions=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) @@ -3454,6 +3454,17 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, bookmarksList=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.getRevisions?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_limitGroup_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagButton_toggled?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_projectDirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) @@ -3684,7 +3695,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_allCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_branchesCombo_editTextChanged?4(txt) -eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_revisionsEdit_textChanged?4(txt) +eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_revisionsEdit_textChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog?1(branchesList, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplant?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplantContinue?4(path)
--- a/Documentation/Help/source.qhp Sat Sep 03 17:13:31 2011 +0200 +++ b/Documentation/Help/source.qhp Sun Sep 04 15:17:10 2011 +0200 @@ -427,6 +427,7 @@ <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" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html" /> @@ -8741,6 +8742,20 @@ <keyword name="HgMergeDialog.on_idEdit_textChanged" id="HgMergeDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idEdit_textChanged" /> <keyword name="HgMergeDialog.on_tagButton_toggled" id="HgMergeDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagButton_toggled" /> <keyword name="HgMergeDialog.on_tagCombo_editTextChanged" id="HgMergeDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagCombo_editTextChanged" /> + <keyword name="HgMultiRevisionSelectionDialog (Module)" id="HgMultiRevisionSelectionDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> + <keyword name="HgMultiRevisionSelectionDialog" id="HgMultiRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog" /> + <keyword name="HgMultiRevisionSelectionDialog (Constructor)" id="HgMultiRevisionSelectionDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__init__" /> + <keyword name="HgMultiRevisionSelectionDialog.__updateOK" id="HgMultiRevisionSelectionDialog.__updateOK" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__updateOK" /> + <keyword name="HgMultiRevisionSelectionDialog.getRevisions" id="HgMultiRevisionSelectionDialog.getRevisions" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.getRevisions" /> + <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" id="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" /> + <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" /> + <keyword name="HgMultiRevisionSelectionDialog.on_branchButton_toggled" id="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchButton_toggled" /> + <keyword name="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" /> + <keyword name="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" id="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" /> + <keyword name="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" id="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" /> + <keyword name="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" id="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_limitGroup_toggled" /> + <keyword name="HgMultiRevisionSelectionDialog.on_tagButton_toggled" id="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagButton_toggled" /> + <keyword name="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" /> <keyword name="HgCommandDialog (Module)" id="HgCommandDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html" /> <keyword name="HgCommandDialog" id="HgCommandDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog" /> <keyword name="HgCommandDialog (Constructor)" id="HgCommandDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html#HgCommandDialog.__init__" /> @@ -8925,8 +8940,8 @@ <keyword name="HgBundleDialog.on_bookmarkCombo_editTextChanged" id="HgBundleDialog.on_bookmarkCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_bookmarkCombo_editTextChanged" /> <keyword name="HgBundleDialog.on_branchButton_toggled" id="HgBundleDialog.on_branchButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_branchButton_toggled" /> <keyword name="HgBundleDialog.on_branchCombo_editTextChanged" id="HgBundleDialog.on_branchCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_branchCombo_editTextChanged" /> - <keyword name="HgBundleDialog.on_idButton_toggled" id="HgBundleDialog.on_idButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_idButton_toggled" /> - <keyword name="HgBundleDialog.on_idEdit_textChanged" id="HgBundleDialog.on_idEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_idEdit_textChanged" /> + <keyword name="HgBundleDialog.on_multipleButton_toggled" id="HgBundleDialog.on_multipleButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_multipleButton_toggled" /> + <keyword name="HgBundleDialog.on_multipleEdit_textChanged" id="HgBundleDialog.on_multipleEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_multipleEdit_textChanged" /> <keyword name="HgBundleDialog.on_tagButton_toggled" id="HgBundleDialog.on_tagButton_toggled" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_tagButton_toggled" /> <keyword name="HgBundleDialog.on_tagCombo_editTextChanged" id="HgBundleDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html#HgBundleDialog.on_tagCombo_editTextChanged" /> <keyword name="HgTagBranchListDialog (Module)" id="HgTagBranchListDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" /> @@ -11371,6 +11386,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Sat Sep 03 17:13:31 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Sun Sep 04 15:17:10 2011 +0200 @@ -79,11 +79,11 @@ <td><a href="#HgBundleDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> <td>Private slot to handle changes of the Branch combo.</td> </tr><tr> -<td><a href="#HgBundleDialog.on_idButton_toggled">on_idButton_toggled</a></td> -<td>Private slot to handle changes of the ID select button.</td> +<td><a href="#HgBundleDialog.on_multipleButton_toggled">on_multipleButton_toggled</a></td> +<td>Private slot to handle changes of the Multiple select button.</td> </tr><tr> -<td><a href="#HgBundleDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> -<td>Private slot to handle changes of the ID edit.</td> +<td><a href="#HgBundleDialog.on_multipleEdit_textChanged">on_multipleEdit_textChanged</a></td> +<td>Private slot to handle changes of the Multiple edit.</td> </tr><tr> <td><a href="#HgBundleDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> <td>Private slot to handle changes of the Tag select button.</td> @@ -128,8 +128,8 @@ </p><dl> <dt>Returns:</dt> <dd> -tuple naming the revision, the compression type and a flag indicating - to bundle all changesets (string, string, boolean) +tuple naming the revisions, base revisions, the compression type and + a flag indicating to bundle all changesets (string, string, boolean) </dd> </dl><a NAME="HgBundleDialog.on_bookmarkButton_toggled" ID="HgBundleDialog.on_bookmarkButton_toggled"></a> <h4>HgBundleDialog.on_bookmarkButton_toggled</h4> @@ -171,27 +171,22 @@ <dd> text of the combo (string) </dd> -</dl><a NAME="HgBundleDialog.on_idButton_toggled" ID="HgBundleDialog.on_idButton_toggled"></a> -<h4>HgBundleDialog.on_idButton_toggled</h4> -<b>on_idButton_toggled</b>(<i>checked</i>) +</dl><a NAME="HgBundleDialog.on_multipleButton_toggled" ID="HgBundleDialog.on_multipleButton_toggled"></a> +<h4>HgBundleDialog.on_multipleButton_toggled</h4> +<b>on_multipleButton_toggled</b>(<i>checked</i>) <p> - Private slot to handle changes of the ID select button. + Private slot to handle changes of the Multiple select button. </p><dl> <dt><i>checked</i></dt> <dd> state of the button (boolean) </dd> -</dl><a NAME="HgBundleDialog.on_idEdit_textChanged" ID="HgBundleDialog.on_idEdit_textChanged"></a> -<h4>HgBundleDialog.on_idEdit_textChanged</h4> -<b>on_idEdit_textChanged</b>(<i>txt</i>) +</dl><a NAME="HgBundleDialog.on_multipleEdit_textChanged" ID="HgBundleDialog.on_multipleEdit_textChanged"></a> +<h4>HgBundleDialog.on_multipleEdit_textChanged</h4> +<b>on_multipleEdit_textChanged</b>(<i></i>) <p> - Private slot to handle changes of the ID edit. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the edit (string) -</dd> -</dl><a NAME="HgBundleDialog.on_tagButton_toggled" ID="HgBundleDialog.on_tagButton_toggled"></a> + Private slot to handle changes of the Multiple edit. +</p><a NAME="HgBundleDialog.on_tagButton_toggled" ID="HgBundleDialog.on_tagButton_toggled"></a> <h4>HgBundleDialog.on_tagButton_toggled</h4> <b>on_tagButton_toggled</b>(<i>checked</i>) <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Sat Sep 03 17:13:31 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Sun Sep 04 15:17:10 2011 +0200 @@ -250,7 +250,7 @@ Private slot to send the input to the hg process. </p><a NAME="HgLogDialog.start" ID="HgLogDialog.start"></a> <h4>HgLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) +<b>start</b>(<i>fn, noEntries=0, revisions=None</i>) <p> Public slot to start the hg log command. </p><dl> @@ -260,6 +260,9 @@ </dd><dt><i>noEntries</i></dt> <dd> number of entries to show (integer) +</dd><dt><i>revisions</i></dt> +<dd> +revisions to show log for (list of strings) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html Sun Sep 04 15:17:10 2011 +0200 @@ -0,0 +1,239 @@ +<?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.HgMultiRevisionSelectionDialog</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.HgMultiRevisionSelectionDialog</h1> +<p> +Module implementing a dialog to select revisions. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgMultiRevisionSelectionDialog">HgMultiRevisionSelectionDialog</a></td> +<td>Class implementing a dialog to select revisions.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgMultiRevisionSelectionDialog" ID="HgMultiRevisionSelectionDialog"></a> +<h2>HgMultiRevisionSelectionDialog</h2> +<p> + Class implementing a dialog to select revisions. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgMultiRevisionSelectionDialog +<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="#HgMultiRevisionSelectionDialog.__init__">HgMultiRevisionSelectionDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.__updateOK">__updateOK</a></td> +<td>Private slot to update the OK button.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.getRevisions">getRevisions</a></td> +<td>Public method to retrieve the selected revisions.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> +<td>Private slot to handle changes of the Bookmark select button.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Bookmark combo.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> +<td>Private slot to handle changes of the Branch select button.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Branch combo.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled">on_changesetsButton_toggled</a></td> +<td>Private slot to handle changes of the Changesets select button.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged">on_changesetsEdit_textChanged</a></td> +<td>Private slot to handle changes of the Changesets edit.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_limitGroup_toggled">on_limitGroup_toggled</a></td> +<td>Private slot to handle changes of the Limit Results group status.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> +<td>Private slot to handle changes of the Tag select button.</td> +</tr><tr> +<td><a href="#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> +<td>Private slot to handle changes of the Tag combo.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgMultiRevisionSelectionDialog.__init__" ID="HgMultiRevisionSelectionDialog.__init__"></a> +<h4>HgMultiRevisionSelectionDialog (Constructor)</h4> +<b>HgMultiRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>tagsList</i></dt> +<dd> +list of tags (list of strings) +</dd><dt><i>branchesList</i></dt> +<dd> +list of branches (list of strings) +</dd><dt><i>bookmarksList</i></dt> +<dd> +list of bookmarks (list of strings) +</dd><dt><i>emptyRevsOk</i></dt> +<dd> +flag indicating that it is ok to not enter revisions (boolean) +</dd><dt><i>showLimit</i></dt> +<dd> +flag indicating to show the limit entry (boolean) +</dd><dt><i>limitDefault</i></dt> +<dd> +default value for the limit (integer) +</dd><dt><i>parent</i></dt> +<dd> +parent widget (QWidget) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.__updateOK" ID="HgMultiRevisionSelectionDialog.__updateOK"></a> +<h4>HgMultiRevisionSelectionDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to update the OK button. +</p><a NAME="HgMultiRevisionSelectionDialog.getRevisions" ID="HgMultiRevisionSelectionDialog.getRevisions"></a> +<h4>HgMultiRevisionSelectionDialog.getRevisions</h4> +<b>getRevisions</b>(<i></i>) +<p> + Public method to retrieve the selected revisions. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple of selected revisions (list of strings) and number + of entries to be shown (integer) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled"></a> +<h4>HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled</h4> +<b>on_bookmarkButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Bookmark select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged"></a> +<h4>HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged</h4> +<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Bookmark combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ID="HgMultiRevisionSelectionDialog.on_branchButton_toggled"></a> +<h4>HgMultiRevisionSelectionDialog.on_branchButton_toggled</h4> +<b>on_branchButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Branch select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> +<h4>HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged</h4> +<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Branch combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ID="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled"></a> +<h4>HgMultiRevisionSelectionDialog.on_changesetsButton_toggled</h4> +<b>on_changesetsButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Changesets select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ID="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged"></a> +<h4>HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged</h4> +<b>on_changesetsEdit_textChanged</b>(<i></i>) +<p> + Private slot to handle changes of the Changesets edit. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the edit (string) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ID="HgMultiRevisionSelectionDialog.on_limitGroup_toggled"></a> +<h4>HgMultiRevisionSelectionDialog.on_limitGroup_toggled</h4> +<b>on_limitGroup_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Limit Results group status. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the group (boolean) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ID="HgMultiRevisionSelectionDialog.on_tagButton_toggled"></a> +<h4>HgMultiRevisionSelectionDialog.on_tagButton_toggled</h4> +<b>on_tagButton_toggled</b>(<i>checked</i>) +<p> + Private slot to handle changes of the Tag select button. +</p><dl> +<dt><i>checked</i></dt> +<dd> +state of the button (boolean) +</dd> +</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> +<h4>HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged</h4> +<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) +<p> + Private slot to handle changes of the Tag combo. +</p><dl> +<dt><i>txt</i></dt> +<dd> +text of the combo (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html Sat Sep 03 17:13:31 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html Sun Sep 04 15:17:10 2011 +0200 @@ -202,15 +202,10 @@ </dd> </dl><a NAME="TransplantDialog.on_revisionsEdit_textChanged" ID="TransplantDialog.on_revisionsEdit_textChanged"></a> <h4>TransplantDialog.on_revisionsEdit_textChanged</h4> -<b>on_revisionsEdit_textChanged</b>(<i>txt</i>) +<b>on_revisionsEdit_textChanged</b>(<i></i>) <p> Private slot to react upon changes of revisions. -</p><dl> -<dt><i>txt</i></dt> -<dd> -contents of the revisions edit (string) -</dd> -</dl> +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sat Sep 03 17:13:31 2011 +0200 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun Sep 04 15:17:10 2011 +0200 @@ -105,6 +105,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html">HgMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html">HgMultiRevisionSelectionDialog</a></td> +<td>Module implementing a dialog to select revisions.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html">HgNewProjectOptionsDialog</a></td> <td>Module implementing the Mercurial Options Dialog for a new project from the repository.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Sep 04 15:17:10 2011 +0200 @@ -45,8 +45,8 @@ Private slot to update the OK button. """ enabled = True - if self.idButton.isChecked(): - enabled = self.idEdit.text() != "" + if self.multipleButton.isChecked(): + enabled = self.multipleEdit.toPlainText() != "" elif self.tagButton.isChecked(): enabled = self.tagCombo.currentText() != "" elif self.branchButton.isChecked(): @@ -57,9 +57,9 @@ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) @pyqtSlot(bool) - def on_idButton_toggled(self, checked): + def on_multipleButton_toggled(self, checked): """ - Private slot to handle changes of the ID select button. + Private slot to handle changes of the Multiple select button. @param checked state of the button (boolean) """ @@ -92,12 +92,10 @@ """ self.__updateOK() - @pyqtSlot(str) - def on_idEdit_textChanged(self, txt): + @pyqtSlot() + def on_multipleEdit_textChanged(self): """ - Private slot to handle changes of the ID edit. - - @param txt text of the edit (string) + Private slot to handle changes of the Multiple edit. """ self.__updateOK() @@ -132,20 +130,21 @@ """ Public method to retrieve the bundle data. - @return tuple naming the revision, the compression type and a flag indicating - to bundle all changesets (string, string, boolean) + @return tuple naming the revisions, base revisions, the compression type and + a flag indicating to bundle all changesets (string, string, boolean) """ - if self.numberButton.isChecked(): - rev = str(self.numberSpinBox.value()) - elif self.idButton.isChecked(): - rev = self.idEdit.text() + if self.multipleButton.isChecked(): + revs = self.multipleEdit.toPlainText().strip().splitlines() elif self.tagButton.isChecked(): - rev = self.tagCombo.currentText() + revs = [self.tagCombo.currentText()] elif self.branchButton.isChecked(): - rev = self.branchCombo.currentText() + revs = [self.branchCombo.currentText()] elif self.bookmarkButton.isChecked(): - rev = self.bookmarkCombo.currentText() + revs = [self.bookmarkCombo.currentText()] else: - rev = "" + revs = [] - return rev, self.compressionCombo.currentText(), self.allCheckBox.isChecked() + baseRevs = self.baseRevisionsEdit.toPlainText().strip().splitlines() + + return (revs, baseRevs, self.compressionCombo.currentText(), + self.allCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui Sun Sep 04 15:17:10 2011 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>372</width> - <height>276</height> + <width>450</width> + <height>452</height> </rect> </property> <property name="windowTitle"> @@ -24,68 +24,32 @@ </property> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> - <widget class="QRadioButton" name="numberButton"> + <widget class="QRadioButton" name="multipleButton"> <property name="toolTip"> - <string>Select to specify a revision by number</string> + <string>Select to specify multiple revisions</string> </property> <property name="text"> - <string>Number</string> + <string>Multiple</string> </property> </widget> </item> <item row="0" column="1"> - <widget class="QSpinBox" name="numberSpinBox"> + <widget class="QPlainTextEdit" name="multipleEdit"> <property name="enabled"> <bool>false</bool> </property> <property name="toolTip"> - <string>Enter a revision number</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight</set> + <string>Enter changesets by number, id, range or revset expression one per line</string> </property> - <property name="minimum"> - <number>1</number> + <property name="tabChangesFocus"> + <bool>true</bool> </property> - <property name="maximum"> - <number>999999999</number> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> </property> </widget> </item> - <item row="0" column="2"> - <spacer name="spacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>158</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item row="1" column="0"> - <widget class="QRadioButton" name="idButton"> - <property name="toolTip"> - <string>Select to specify a revision by changeset id</string> - </property> - <property name="text"> - <string>Id:</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QLineEdit" name="idEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a changeset id</string> - </property> - </widget> - </item> - <item row="2" column="0"> <widget class="QRadioButton" name="tagButton"> <property name="toolTip"> <string>Select to specify a revision by a tag</string> @@ -95,7 +59,7 @@ </property> </widget> </item> - <item row="2" column="1" colspan="2"> + <item row="1" column="1"> <widget class="QComboBox" name="tagCombo"> <property name="enabled"> <bool>false</bool> @@ -108,7 +72,7 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="2" column="0"> <widget class="QRadioButton" name="branchButton"> <property name="toolTip"> <string>Select to specify a revision by a branch</string> @@ -118,7 +82,7 @@ </property> </widget> </item> - <item row="3" column="1" colspan="2"> + <item row="2" column="1"> <widget class="QComboBox" name="branchCombo"> <property name="enabled"> <bool>false</bool> @@ -131,7 +95,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="3" column="0"> <widget class="QRadioButton" name="bookmarkButton"> <property name="toolTip"> <string>Select to specify a revision by a bookmark</string> @@ -141,7 +105,7 @@ </property> </widget> </item> - <item row="4" column="1" colspan="2"> + <item row="3" column="1"> <widget class="QComboBox" name="bookmarkCombo"> <property name="enabled"> <bool>false</bool> @@ -160,7 +124,7 @@ </property> </widget> </item> - <item row="5" column="0" colspan="3"> + <item row="4" column="0" colspan="2"> <widget class="QRadioButton" name="noneButton"> <property name="toolTip"> <string>Select to not specify a specific revision</string> @@ -177,11 +141,52 @@ </widget> </item> <item> - <widget class="QComboBox" name="compressionCombo"> - <property name="toolTip"> - <string>Select the compression type (empty for default)</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Base Revisions:</string> + </property> + </widget> + </item> + <item> + <widget class="QPlainTextEdit" name="baseRevisionsEdit"> + <property name="toolTip"> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Compression:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="compressionCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the compression type (empty for default)</string> + </property> + </widget> + </item> + </layout> </item> <item> <widget class="QCheckBox" name="allCheckBox"> @@ -206,10 +211,8 @@ </layout> </widget> <tabstops> - <tabstop>numberButton</tabstop> - <tabstop>numberSpinBox</tabstop> - <tabstop>idButton</tabstop> - <tabstop>idEdit</tabstop> + <tabstop>multipleButton</tabstop> + <tabstop>multipleEdit</tabstop> <tabstop>tagButton</tabstop> <tabstop>tagCombo</tabstop> <tabstop>branchButton</tabstop> @@ -217,6 +220,7 @@ <tabstop>bookmarkButton</tabstop> <tabstop>bookmarkCombo</tabstop> <tabstop>noneButton</tabstop> + <tabstop>baseRevisionsEdit</tabstop> <tabstop>compressionCombo</tabstop> <tabstop>allCheckBox</tabstop> <tabstop>buttonBox</tabstop> @@ -230,8 +234,8 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>261</x> - <y>271</y> + <x>270</x> + <y>442</y> </hint> <hint type="destinationlabel"> <x>157</x> @@ -246,8 +250,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>329</x> - <y>271</y> + <x>338</x> + <y>442</y> </hint> <hint type="destinationlabel"> <x>286</x> @@ -256,50 +260,18 @@ </hints> </connection> <connection> - <sender>numberButton</sender> - <signal>toggled(bool)</signal> - <receiver>numberSpinBox</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>48</x> - <y>42</y> - </hint> - <hint type="destinationlabel"> - <x>113</x> - <y>43</y> - </hint> - </hints> - </connection> - <connection> - <sender>idButton</sender> - <signal>toggled(bool)</signal> - <receiver>idEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>38</x> - <y>76</y> - </hint> - <hint type="destinationlabel"> - <x>125</x> - <y>75</y> - </hint> - </hints> - </connection> - <connection> <sender>tagButton</sender> <signal>toggled(bool)</signal> <receiver>tagCombo</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>52</x> - <y>104</y> + <x>72</x> + <y>154</y> </hint> <hint type="destinationlabel"> - <x>124</x> - <y>99</y> + <x>234</x> + <y>154</y> </hint> </hints> </connection> @@ -310,12 +282,12 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>71</x> - <y>127</y> + <x>91</x> + <y>181</y> </hint> <hint type="destinationlabel"> - <x>123</x> - <y>130</y> + <x>233</x> + <y>181</y> </hint> </hints> </connection> @@ -326,12 +298,28 @@ <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> - <x>45</x> - <y>150</y> + <x>65</x> + <y>208</y> </hint> <hint type="destinationlabel"> - <x>125</x> - <y>148</y> + <x>235</x> + <y>208</y> + </hint> + </hints> + </connection> + <connection> + <sender>multipleButton</sender> + <signal>toggled(bool)</signal> + <receiver>multipleEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>60</x> + <y>78</y> + </hint> + <hint type="destinationlabel"> + <x>141</x> + <y>83</y> </hint> </hints> </connection>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Sep 04 15:17:10 2011 +0200 @@ -92,12 +92,13 @@ e.accept() - def start(self, fn, noEntries=0): + def start(self, fn, noEntries=0, revisions=None): """ Public slot to start the hg log command. @param fn filename to show the log for (string) @param noEntries number of entries to show (integer) + @param revisions revisions to show log for (list of strings) """ self.errorGroup.hide() QApplication.processEvents() @@ -145,6 +146,10 @@ project.getProjectManagementDir(), "hg-bundle.hg") args.append('--bundle') args.append(self.vcs.bundleFile) + if revisions: + for rev in revisions: + args.append("--rev") + args.append(rev) if not self.projectMode: args.append(self.filename)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Sun Sep 04 15:17:10 2011 +0200 @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select revisions. +""" + +from PyQt4.QtCore import pyqtSlot +from PyQt4.QtGui import QDialog, QDialogButtonBox + +from .Ui_HgMultiRevisionSelectionDialog import Ui_HgMultiRevisionSelectionDialog + + +class HgMultiRevisionSelectionDialog(QDialog, Ui_HgMultiRevisionSelectionDialog): + """ + Class implementing a dialog to select revisions. + """ + def __init__(self, tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, + showLimit=False, limitDefault=100, parent=None): + """ + Constructor + + @param tagsList list of tags (list of strings) + @param branchesList list of branches (list of strings) + @param bookmarksList list of bookmarks (list of strings) + @param emptyRevsOk flag indicating that it is ok to not enter revisions (boolean) + @param showLimit flag indicating to show the limit entry (boolean) + @param limitDefault default value for the limit (integer) + @param parent parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) + + self.__emptyRevsOk = emptyRevsOk + + self.tagCombo.addItems(sorted(tagsList)) + self.branchCombo.addItems(["default"] + sorted(branchesList)) + if bookmarksList is not None: + self.bookmarkCombo.addItems(sorted(bookmarksList)) + else: + self.bookmarkButton.setHidden(True) + self.bookmarkCombo.setHidden(True) + + self.limitSpinBox.setValue(limitDefault) + self.limitGroup.setVisible(showLimit) + + def __updateOK(self): + """ + Private slot to update the OK button. + """ + enabled = True + if self.changesetsButton.isChecked(): + enabled = self.changesetsEdit.toPlainText() != "" + elif self.tagButton.isChecked(): + enabled = self.tagCombo.currentText() != "" + elif self.branchButton.isChecked(): + enabled = self.branchCombo.currentText() != "" + elif self.bookmarkButton.isChecked(): + enabled = self.bookmarkCombo.currentText() != "" + if not enabled and self.__emptyRevsOk: + enabled = self.limitGroup.isChecked() + + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) + + @pyqtSlot(bool) + def on_changesetsButton_toggled(self, checked): + """ + Private slot to handle changes of the Changesets select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_tagButton_toggled(self, checked): + """ + Private slot to handle changes of the Tag select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_branchButton_toggled(self, checked): + """ + Private slot to handle changes of the Branch select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_bookmarkButton_toggled(self, checked): + """ + Private slot to handle changes of the Bookmark select button. + + @param checked state of the button (boolean) + """ + self.__updateOK() + + @pyqtSlot() + def on_changesetsEdit_textChanged(self): + """ + Private slot to handle changes of the Changesets edit. + + @param txt text of the edit (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_tagCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Tag combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_branchCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Branch combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(str) + def on_bookmarkCombo_editTextChanged(self, txt): + """ + Private slot to handle changes of the Bookmark combo. + + @param txt text of the combo (string) + """ + self.__updateOK() + + @pyqtSlot(bool) + def on_limitGroup_toggled(self, checked): + """ + Private slot to handle changes of the Limit Results group status. + + @param checked state of the group (boolean) + """ + self.__updateOK() + + def getRevisions(self): + """ + Public method to retrieve the selected revisions. + + @return tuple of selected revisions (list of strings) and number + of entries to be shown (integer) + """ + if self.changesetsButton.isChecked(): + revs = self.changesetsEdit.toPlainText().strip().splitlines() + elif self.tagButton.isChecked(): + revs = [self.tagCombo.currentText()] + elif self.branchButton.isChecked(): + revs = [self.branchCombo.currentText()] + elif self.bookmarkButton.isChecked(): + revs = [self.bookmarkCombo.currentText()] + else: + revs = [] + + if self.limitGroup.isChecked(): + limit = self.limitSpinBox.value() + else: + limit = 0 + + return revs, limit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui Sun Sep 04 15:17:10 2011 +0200 @@ -0,0 +1,317 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgMultiRevisionSelectionDialog</class> + <widget class="QDialog" name="HgMultiRevisionSelectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>330</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Revisions</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Revision</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QRadioButton" name="changesetsButton"> + <property name="toolTip"> + <string>Select to specify a list of changesets</string> + </property> + <property name="text"> + <string>Changesets:</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPlainTextEdit" name="changesetsEdit"> + <property name="toolTip"> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QRadioButton" name="tagButton"> + <property name="toolTip"> + <string>Select to specify a revision by a tag</string> + </property> + <property name="text"> + <string>Tag:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="tagCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a tag name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QRadioButton" name="branchButton"> + <property name="toolTip"> + <string>Select to specify a revision by a branch</string> + </property> + <property name="text"> + <string>Branch:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="branchCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a branch name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QRadioButton" name="bookmarkButton"> + <property name="toolTip"> + <string>Select to specify a revision by a bookmark</string> + </property> + <property name="text"> + <string>Bookmark:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="bookmarkCombo"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter a bookmark name</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="limitGroup"> + <property name="title"> + <string>Limit Results</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Enter number of entries to show:</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>9999</number> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>164</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>changesetsButton</tabstop> + <tabstop>changesetsEdit</tabstop> + <tabstop>tagButton</tabstop> + <tabstop>tagCombo</tabstop> + <tabstop>branchButton</tabstop> + <tabstop>branchCombo</tabstop> + <tabstop>bookmarkButton</tabstop> + <tabstop>bookmarkCombo</tabstop> + <tabstop>limitGroup</tabstop> + <tabstop>limitSpinBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgMultiRevisionSelectionDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>266</x> + <y>319</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgMultiRevisionSelectionDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>334</x> + <y>319</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>223</y> + </hint> + </hints> + </connection> + <connection> + <sender>tagButton</sender> + <signal>toggled(bool)</signal> + <receiver>tagCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>89</x> + <y>149</y> + </hint> + <hint type="destinationlabel"> + <x>253</x> + <y>149</y> + </hint> + </hints> + </connection> + <connection> + <sender>branchButton</sender> + <signal>toggled(bool)</signal> + <receiver>branchCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>80</x> + <y>175</y> + </hint> + <hint type="destinationlabel"> + <x>238</x> + <y>175</y> + </hint> + </hints> + </connection> + <connection> + <sender>bookmarkButton</sender> + <signal>toggled(bool)</signal> + <receiver>bookmarkCombo</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>45</x> + <y>201</y> + </hint> + <hint type="destinationlabel"> + <x>251</x> + <y>201</y> + </hint> + </hints> + </connection> + <connection> + <sender>changesetsButton</sender> + <signal>toggled(bool)</signal> + <receiver>changesetsEdit</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>59</x> + <y>81</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>80</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Sep 04 15:17:10 2011 +0200 @@ -747,14 +747,14 @@ self.actions.append(self.hgBisectBadAct) self.hgBisectSkipAct = E5Action(self.trUtf8('Skip'), - self.trUtf8('Skip'), + self.trUtf8('Skip...'), 0, 0, self, 'mercurial_bisect_skip') self.hgBisectSkipAct.setStatusTip(self.trUtf8( - 'Skip the current changeset' + 'Skip a selectable changeset' )) self.hgBisectSkipAct.setWhatsThis(self.trUtf8( """<b>Skip</b>""" - """<p>This skips the current changeset.</p>""" + """<p>This skips a selectable changeset.</p>""" )) self.hgBisectSkipAct.triggered[()].connect(self.__hgBisectSkip) self.actions.append(self.hgBisectSkipAct)
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sun Sep 04 15:17:10 2011 +0200 @@ -83,11 +83,7 @@ self.branchesCombo.addItems(["", "default"] + sorted(branchesList)) - self.__revisionsValidator = RevisionsValidator(True, self) - self.__pruneRevisionsValidator = RevisionsValidator(False, self) self.__mergeRevisionsValidator = RevisionsValidator(False, self) - self.revisionsEdit.setValidator(self.__revisionsValidator) - self.pruneEdit.setValidator(self.__pruneRevisionsValidator) self.mergeEdit.setValidator(self.__mergeRevisionsValidator) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) @@ -97,14 +93,12 @@ Private slot to update the state of the OK button. """ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.revisionsEdit.text() != "" or self.allCheckBox.isChecked()) + self.revisionsEdit.toPlainText() != "" or self.allCheckBox.isChecked()) - @pyqtSlot(str) - def on_revisionsEdit_textChanged(self, txt): + @pyqtSlot() + def on_revisionsEdit_textChanged(self): """ Private slot to react upon changes of revisions. - - @param txt contents of the revisions edit (string) """ self.__updateOk() @@ -137,11 +131,11 @@ list of strings, boolean) """ return ( - self.revisionsEdit.text().strip().split(), + self.revisionsEdit.toPlainText().strip().splitlines(), self.repoEdit.text().strip(), self.branchesCombo.currentText().strip(), self.allCheckBox.isChecked(), - self.pruneEdit.text().strip().split(), + self.pruneEdit.toPlainText().strip().splitlines(), self.mergeEdit.text().strip().split(), self.logCheckBox.isChecked() )
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui Sun Sep 04 15:17:10 2011 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> - <height>213</height> + <width>450</width> + <height>382</height> </rect> </property> <property name="windowTitle"> @@ -28,9 +28,15 @@ </widget> </item> <item row="0" column="1"> - <widget class="QLineEdit" name="revisionsEdit"> + <widget class="QPlainTextEdit" name="revisionsEdit"> <property name="toolTip"> - <string>Enter the revisions or revision ranges to be transplanted separated by a space character</string> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> </property> </widget> </item> @@ -95,9 +101,15 @@ </widget> </item> <item row="4" column="1"> - <widget class="QLineEdit" name="pruneEdit"> + <widget class="QPlainTextEdit" name="pruneEdit"> <property name="toolTip"> - <string>Enter revisions to be skipped separated by a space character</string> + <string>Enter changesets by number, id, range or revset expression one per line</string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> </property> </widget> </item> @@ -162,8 +174,8 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>222</x> - <y>198</y> + <x>231</x> + <y>372</y> </hint> <hint type="destinationlabel"> <x>157</x> @@ -178,8 +190,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>290</x> - <y>204</y> + <x>299</x> + <y>372</y> </hint> <hint type="destinationlabel"> <x>286</x>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Sep 03 17:13:31 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Sep 04 15:17:10 2011 +0200 @@ -35,6 +35,7 @@ from .HgDiffDialog import HgDiffDialog from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog from .HgRevisionSelectionDialog import HgRevisionSelectionDialog +from .HgMultiRevisionSelectionDialog import HgMultiRevisionSelectionDialog from .HgMergeDialog import HgMergeDialog from .HgStatusMonitorThread import HgStatusMonitorThread from .HgStatusDialog import HgStatusDialog @@ -719,15 +720,33 @@ @param name file/directory name to show the log of (string) """ - noEntries, ok = QInputDialog.getInteger( - None, - self.trUtf8("Mercurial Log"), - self.trUtf8("Select number of entries to show."), - self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) - if ok: + 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 + + if self.isExtensionActive("bookmarks"): + bookmarksList = \ + self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) + else: + bookmarksList = None + + dlg = HgMultiRevisionSelectionDialog( + self.hgGetTagsList(repodir), + self.hgGetBranchesList(repodir), + bookmarksList, + emptyRevsOk=True, + showLimit=True, + limitDefault=self.getPlugin().getPreferences("LogLimit")) + if dlg.exec_() == QDialog.Accepted: + revs, noEntries = dlg.getRevisions() self.log = HgLogDialog(self) self.log.show() - self.log.start(name, noEntries) + self.log.start(name, noEntries=noEntries, revisions=revs) def vcsDiff(self, name): """ @@ -2002,7 +2021,7 @@ self.hgGetBranchesList(repodir), bookmarksList) if dlg.exec_() == QDialog.Accepted: - rev, compression, all = dlg.getParameters() + revs, baseRevs, compression, all = dlg.getParameters() fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( None, @@ -2035,9 +2054,12 @@ args.append('bundle') if all: args.append("--all") - if rev: + for rev in revs: args.append("--rev") args.append(rev) + for baseRev in baseRevs: + args.append("--base") + args.append(baseRev) if compression: args.append("--type") args.append(compression) @@ -2169,7 +2191,7 @@ return rev = "" - if subcommand in ("good", "bad"): + if subcommand in ("good", "bad", "skip"): if self.isExtensionActive("bookmarks"): bookmarksList = \ self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
--- a/changelog Sat Sep 03 17:13:31 2011 +0200 +++ b/changelog Sun Sep 04 15:17:10 2011 +0200 @@ -17,6 +17,7 @@ --- made "Show Log" behave like "Show Limited Log" and removed the later -- Mercurial --- added interface for the Mercurial command server (as of Mercurial 1.9) + --- added code to support multiple revisions where appropriate Version 5.2-snapshot-20110724: - bug fixes
--- a/eric5.e4p Sat Sep 03 17:13:31 2011 +0200 +++ b/eric5.e4p Sun Sep 04 15:17:10 2011 +0200 @@ -928,6 +928,7 @@ <Source>Preferences/ConfigurationPages/SecurityPage.py</Source> <Source>UtilitiesPython2/PySideImporter.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgClient.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1189,6 +1190,7 @@ <Form>Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui</Form> <Form>Preferences/ConfigurationPages/MasterPasswordEntryDialog.ui</Form> <Form>Preferences/ConfigurationPages/SecurityPage.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
--- a/i18n/eric5_cs.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_cs.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15619,42 +15619,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <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="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <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="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -15664,167 +15664,167 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <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="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <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="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>Mercurial log</translation> + <translation type="obsolete">Mercurial log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Vyberte počet položek, které se mají zobrazit.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <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="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <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="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <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="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15834,57 +15834,57 @@ <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="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <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="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16475,103 +16475,128 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Vybrat pro zadání revize číslem</translation> + <translation type="obsolete">Vybrat pro zadání revize číslem</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Číslo</translation> + <translation type="obsolete">Číslo</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Zadejte číslo revize</translation> + <translation type="obsolete">Zadejte číslo revize</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> - <translation>Vybrat pro zadání revize přes id množiny změn</translation> + <translation type="obsolete">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> <source>Id:</source> - <translation>Id:</translation> + <translation type="obsolete">Id:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Zadejte id množiny změn</translation> + <translation type="obsolete">Zadejte id množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Větev:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Vybrat pro specifikaci revize tagem</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Tag:</translation> + <source>Enter a branch name</source> + <translation>Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Vybrat pro specifikaci konkrétní revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Nebyla vybrána revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Vybrat pro zabalení množin změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Zabalit všechny množiny změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Zadejte jméno tagu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Vybrat pro specifikaci revize přes větev</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Větev:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Zadejte jméno větve</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Vybrat pro specifikaci konkrétní revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Nebyla vybrána revize</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Vybrat typ komprese (prázdné pro výchozí nastavení)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Vybrat pro zabalení množin změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Zabalit všechny množiny změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17581,98 +17606,98 @@ <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <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/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17787,6 +17812,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Zadejte jméno tagu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Větev:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Zadejte jméno větve</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18822,12 +18930,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> - <translation>Přeskočit aktuální množinu změn</translation> + <translation type="obsolete">Přeskočit aktuální množinu změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> + <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> @@ -19079,6 +19187,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35510,182 +35633,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Vytvořit projekt v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Projekt nemůže být v repozitáři vytvořen. Buďto daný repozitář neexistuje nebo se nelze připojit k serveru s repozitářem.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Projekt se nepodařilo stáhnout (checkout) z repozitáře. <br />Obnovuji původní obsah.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Importovat projekt do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Tag musí být normální tag (tagy) nebo tag větve (větví). Prosím vyberte ze seznamu.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Checkout projektu ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Exportuje projekt z Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Commit změn do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Smazat Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Zadejte jméno vlastnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Zamknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Odemknout v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Vlastnost nastavena.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation></translation> </message> @@ -35840,37 +35963,37 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -35890,53 +36013,53 @@ <translation>Seznam změn byl přesunut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>Inportovaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -42275,68 +42398,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -49440,30 +49558,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49474,23 +49592,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="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -49498,7 +49616,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="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -49742,17 +49860,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_de.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15270,262 +15270,252 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <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="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <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="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <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="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <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="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <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="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Mercurial Log</source> - <translation>Mercurial Log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Select number of entries to show.</source> - <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <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="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <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="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <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="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <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> @@ -16117,105 +16107,100 @@ <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> - <source>Select to specify a revision by number</source> - <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> - <source>Number</source> - <translation>Nummer</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> - <source>Enter a revision number</source> - <translation>Gib eine Revisionsnummer ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> - <source>Select to specify a revision by changeset id</source> - <translation>Auswählen, um eine Revision mit ihrer Änderungssatz ID anzugeben</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> - <source>Id:</source> - <translation>Id:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> - <source>Enter a changeset id</source> - <translation>Gib die Änderungssatz ID ein</translation> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Zweig:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Auswählen, um eine Revision per Marke zu wählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Marke:</translation> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Auswählen, um keine spezifische Revision zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Keine Revision ausgewählt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Wähle den Kompressionstype (leer für Standard)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Auswählen, um alle Änderungssätze zu packen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Packe alle Änderungssätze</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Gib den Namen der Marke ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Zweig:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Gib einen Zweignamen ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Auswählen, um keine spezifische Revision zu wählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Keine Revision ausgewählt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Wähle den Kompressionstype (leer für Standard)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Auswählen, um alle Änderungssätze zu packen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Packe alle Änderungssätze</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation>Auswählen, um eine mehrfache Revisionen zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation>Mehrfach</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation>Basisrevisionen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation>Kompression:</translation> + </message> </context> <context> <name>HgClient</name> @@ -17221,104 +17206,104 @@ <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>Kein Log für '{0}' verfügbar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Zweige: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Marken: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation>Vorgänger: {0}<br /> -</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Autor: {0}</i><br /> -</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation>Vorgänger: {0}<br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation><i>Autor: {0}</i><br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Hinzugefügt: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Modifiziert: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Gelöscht: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <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/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Hinzugefügt: {0} (kopiert von {1})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation>Lesezeichen: {0}<br /> @@ -17434,6 +17419,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation>Mercurial Revisionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation>Revision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation>Auswählen, um eine Liste von Änderungssätzen anzugeben</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation>Änderungssätze:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Auswählen, um eine Revision per Marke zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Marke:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation>Gib den Namen der Marke ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation>Zweig:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation>Gib einen Zweignamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation>Lesezeichen:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation>Gib einen Lesezeichennamen ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation>Ergebnisse begrenzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation>Gib die Anzahl der anzuzeigenden Einträge ein:</translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18414,16 +18482,6 @@ <translation>Überspringen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip the current changeset</source> - <translation>Überspringe den aktuellen Änderungssatz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Zurücksetzen</translation> @@ -18673,6 +18731,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation>Überspringen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation>Überspringe einen auswählbaren Änderungssatz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <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> </context> <context> <name>HgPurgeListDialog</name> @@ -34884,224 +34957,224 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Lade das Projekt in das Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Lade das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Verschiebe {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Das Tag muß ein normales Tag (tags) oder ein Zweigtag (branches) sein. Bitte aus der Liste auswählen.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Pflege Änderungen in das Subversion Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Gleiche mit dem Subversion Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Füge Dateien/Verzeichnisse dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Füge Verzeichnisbäume dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Projekt im Repository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Das Projekt konnte nicht im Repository angelegt werden. Vielleicht existiert das angegebene Repository nicht oder der Repository-Server ist nicht verfügbar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -35256,49 +35329,49 @@ <translation>unversioniert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>Revision {0} importiert. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>Der svn Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Der svn Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -41651,69 +41724,64 @@ <translation>&Revisionen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation>Repositor&y:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation>Gib eine Repository URL ein, wenn Änderungssätze aus einem Repository transplantiert werden sollen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation>&Zweig:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation>Wählen einen zu transplantierenden Zweig aus oder gib seinen Namen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation>Auswählen, um alle Änderungssätze des Zweiges zu transplantieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation>&Alle Änderungssätze transplantieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation>Über&springen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation>Gib Revisionen, die übersprungen werden sollen, durch Leerzeichen getrennt ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation>&Zusammenführen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation>Gib Revisionen, die zusammengeführt werden sollen, durch Leerzeichen getrennt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation>Auswählen, um eine Transplantationsinformation an die Änderungsmeldung anzuhängen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation>Änderungs&information anhängen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> - <translation>Gib die Revisionen oder Revisionsbereiche, die transplantiert werden sollen, durch Leerzeichen getrennt ein</translation> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation>Gib Änderungssätze mittels Nummer, ID, Bereich oder Revset Ausdruck je einen pro Zeile ein</translation> </message> </context> <context> @@ -48630,24 +48698,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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> @@ -48656,7 +48724,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48673,24 +48741,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -48701,7 +48769,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <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> @@ -48945,17 +49013,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> - <source>unknown</source> - <translation>Unbekannt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <source>unknown</source> + <translation>Unbekannt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_en.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_en.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15186,262 +15186,252 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Select number of entries to show.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16030,105 +16020,100 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> - <source>Select to specify a revision by number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> - <source>Number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> - <source>Enter a revision number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> - <source>Enter a changeset id</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17126,96 +17111,96 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> + <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17330,6 +17315,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18378,16 +18446,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip the current changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished"></translation> @@ -18562,6 +18620,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -34555,269 +34628,269 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -41235,68 +41308,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -48197,30 +48265,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48231,23 +48299,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> - <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="1680"/> - <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="1683"/> + <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="1699"/> + <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="1702"/> <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> @@ -48255,7 +48323,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -48499,17 +48567,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> - <source>unknown</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_es.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15441,42 +15441,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <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="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> @@ -15486,222 +15486,222 @@ <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <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="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>Registro de Mercurial</translation> + <translation type="obsolete">Registro de Mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Seleccionar número de entradas a mostrar.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Seleccionar número de entradas a mostrar.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <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="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <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="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <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="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <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="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <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="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <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="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16295,103 +16295,128 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Seleccionar para especificar una revisión por número</translation> + <translation type="obsolete">Seleccionar para especificar una revisión por número</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Número</translation> + <translation type="obsolete">Número</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Introduzca un número de revisión</translation> + <translation type="obsolete">Introduzca un número de revisión</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> - <translation>Seleccionar para especificar una revisión por changeset id</translation> + <translation type="obsolete">Seleccionar para especificar una revisión por changeset id</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> <source>Id:</source> - <translation>Id:</translation> + <translation type="obsolete">Id:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Introduzca un changeset id</translation> + <translation type="obsolete">Introduzca un changeset id</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleccionar para especificar una revisión por branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Branch:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Seleccionar para especificar una revisión por tag</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Tag:</translation> + <source>Enter a branch name</source> + <translation>Introducir un nombre de branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Seleccionar para no especificar una revisión específica</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>No se ha seleccionado revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Seleccionar tipo de compresión (dejar en blanco para valor por defecto)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Seleccionar para hacer bundle con todos los changesets</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Bundle con todos los changesets</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation>Seleccionar para especificar una revisión por un marcador</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Introduzca un nombre de tag</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Seleccionar para especificar una revisión por branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Branch:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Introducir un nombre de branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Seleccionar para no especificar una revisión específica</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>No se ha seleccionado revisión</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Seleccionar tipo de compresión (dejar en blanco para valor por defecto)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Seleccionar para hacer bundle con todos los changesets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Bundle con todos los changesets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation>Seleccionar para especificar una revisión por un marcador</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17397,105 +17422,105 @@ <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation>Parents: {0}<br /> -</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Autor: {0}</i><br /> -</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation>Parents: {0}<br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation><i>Autor: {0}</i><br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <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/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <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/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Añadido {0} (copiado de {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation>Marcadores: {0}<br /> @@ -17611,6 +17636,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleccionar para especificar una revisión por tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Introduzca un nombre de tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Introducir un nombre de branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished">Marcador:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished">Introduzca un nombre de marcador</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18653,12 +18761,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> - <translation>Saltar el changeset actual</translation> + <translation type="obsolete">Saltar el changeset actual</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Saltar</b><p>Salta el changeset actual.</p></translation> + <translation type="obsolete"><b>Saltar</b><p>Salta el changeset actual.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> @@ -18910,6 +19018,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35105,202 +35228,202 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>El proceso svn no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>No se ha podido ejecutar svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Crear proyecto en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>El proyecto no se ha podido crear en el repositorio. Quizá el repositorio proporcionado no existe o el servidor está caído.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Proyecto nuevo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>No se ha podido hacer un checkout del proyecto en el repositorio.<br/>Restaurando los contenidos originales.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Importando proyecto al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>Checkout de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>El tag debe ser una tag (tags) normal o branch (branches). Por favor, seleccione de la lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Haciendo checkout del proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>Export de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Exportando proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Haciendo commit de los cambios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Sincronizando con el repositorio de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Añadiendo archivos/directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Añadiendo árboles de directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Borrar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Introducir nombre de la propiedad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Log de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Bloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Desbloqueando en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Propiedad establecida.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -35455,17 +35578,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -35485,53 +35608,53 @@ <translation>Lista de cambios movida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>El proceso svn ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Moviendo {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>Importada revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -41881,69 +42004,74 @@ <translation>&Revisiones:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation>Repositor&io:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation>Introduzca una URL de repositorio si los changesets deben ser trasplantados desde un repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation>&Branch:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation>Seleccione o introduzca la branch desde la que tranplantar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation>Seleccionar para trasplantar todos los changesets de la branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation>Traspl&antar Todos los Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation>&Saltar:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> <source>Enter revisions to be skipped separated by a space character</source> - <translation>Introduzac las revisiones a ignorar separadas por un carácter de espacio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <translation type="obsolete">Introduzac las revisiones a ignorar separadas por un carácter de espacio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation>&Merge:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation>Introduzca las revisiones sobre las que hacer merge separadas por un carácter de espacio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation>Seleccionar para añadir información de trasplante al mensaje de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation>Añadir &Información de Trasplante</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> - <translation>Introduzca la revisión o rango de revisiones a ser trasplantados separados por un carácter de espacio</translation> + <translation type="obsolete">Introduzca la revisión o rango de revisiones a ser trasplantados separados por un carácter de espacio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -48906,17 +49034,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -48927,31 +49055,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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> @@ -48960,7 +49088,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48977,7 +49105,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <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> @@ -49221,17 +49349,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_fr.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_fr.ts Sun Sep 04 15:17:10 2011 +0200 @@ -16771,262 +16771,257 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17617,103 +17612,113 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> + <translation type="obsolete">Sélectionner pour spécifier une révision par son numéro</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation type="unfinished">Numéro</translation> + <translation type="obsolete">Numéro</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation type="unfinished">Entrer un numéro de révision</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> - <source>Enter a changeset id</source> + <translation type="obsolete">Entrer un numéro de révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -18735,96 +18740,96 @@ <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> + <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -18939,6 +18944,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Révision</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -19943,16 +20031,6 @@ <translation type="unfinished">Passer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip the current changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> @@ -20202,6 +20280,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -38375,47 +38468,47 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Importer le projet dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>'Checkout' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>L'étiquette doit être une étiquette normale (tags) ou une étiquette de branche (branches). Prière de faire un choix dans la liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>'Checkout' du projet depuis le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>'Export' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -38425,12 +38518,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -38450,7 +38543,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -38465,97 +38558,97 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>'Commiter' les modifications dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronisation avec le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Ajouter des fichiers/répertoires au référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Ajouter des arborescences de répertoires dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Créer un projet dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Impossible de créer le projet dans le référentiel. Peut-être que le référentiel indiqué n'existe pas ou que le serveur ne répond pas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -38572,27 +38665,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -38758,37 +38851,37 @@ <translation type="obsolete">Le processus SVN s'est terminé avec le code de sortie %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -38808,53 +38901,53 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -45588,68 +45681,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -53394,30 +53482,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53428,23 +53516,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> - <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="1680"/> - <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="1683"/> + <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="1699"/> + <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="1702"/> <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> @@ -53452,7 +53540,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -53702,7 +53790,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -53712,12 +53800,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_it.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15380,42 +15380,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <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="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <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="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <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="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -15425,222 +15425,222 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <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="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <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="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>Mercurial Log</translation> + <translation type="obsolete">Mercurial Log</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Mostra il numero di elementi da mostrare.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <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="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <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="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <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="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <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="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <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="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16231,103 +16231,128 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Seleziona per specificare una revisione con un numero</translation> + <translation type="obsolete">Seleziona per specificare una revisione con un numero</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Numero</translation> + <translation type="obsolete">Numero</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Inserisci un numero di revisione</translation> + <translation type="obsolete">Inserisci un numero di revisione</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> - <translation>Seleziona per specificare la revisione dall'id del changeset</translation> + <translation type="obsolete">Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> <source>Id:</source> - <translation>Id:</translation> + <translation type="obsolete">Id:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Inserisci id del changeset</translation> + <translation type="obsolete">Inserisci id del changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Inserisci il nome del tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Branch:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Seleziona per specificare una revisione con un tag</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Tag:</translation> + <source>Enter a branch name</source> + <translation>Inserisci un nome di branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Seleziona per non indicare una specifica revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Nessuna revisione selezionata</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Selezionare il tipo di compressione (vuoto per default)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Seleziona per pacchettizare tutti i changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Pacchettizza tutti i changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Inserisci il nome del tag</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Seleziona per specificare una revisione con un branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Branch:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Inserisci un nome di branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Seleziona per non indicare una specifica revisione</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Nessuna revisione selezionata</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Selezionare il tipo di compressione (vuoto per default)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Seleziona per pacchettizare tutti i changeset</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Pacchettizza tutti i changeset</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17332,105 +17357,105 @@ <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>Nessun log disponibile per '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>diff su {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation>Parents: {0}<br /> -</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Autore: {0}</i><br /> -</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation>Parents: {0}<br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation><i>Autore: {0}</i><br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Data: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Aggiunti: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Modificati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Cancellati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <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/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Aggiunti {0} (copiati da {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17545,6 +17570,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Tag:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Inserisci il nome del tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Branch:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Inserisci un nome di branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18587,12 +18695,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> - <translation>Salta il changeset corrente</translation> + <translation type="obsolete">Salta il changeset corrente</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Skip</b><p>Salta il changest corrente.</p></translation> + <translation type="obsolete"><b>Skip</b><p>Salta il changest corrente.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> @@ -18844,6 +18952,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35018,182 +35141,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Importazione del progetto nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Il tag deve essere un tag normale (tags) o un tag branch (branch). Selezionarlo dalla lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Checking del progetto dal repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>L'URL del repository del progetto a un formato non valido. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Subversion Delete Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Inserisci nome proprietà</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Commit delle modifiche nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Sincronizzazione con il repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Aggiunta di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Aggiunta di alberi di directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Rimozione di file/directory al repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Risoluzione conflitti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Crea progetto nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Il progetto non può essere creato nel repository. Probabilmente il repository non esiste o il server non è disponibile.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Nuovo progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Blocco nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Sblocco del repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Proprietà impostata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -35348,37 +35471,37 @@ <translation>non versionato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Il processo svn non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -35398,53 +35521,53 @@ <translation>Changelist spostata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>Il processo svn è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Spostamento di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>importata revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -41803,68 +41926,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -48829,24 +48947,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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> @@ -48855,7 +48973,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48872,24 +48990,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -48899,7 +49017,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -49143,17 +49261,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_ru.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_ru.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15487,42 +15487,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -15532,222 +15532,222 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>лог</translation> + <translation type="obsolete">лог</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Задайте количество элементов для отображения.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Задайте количество элементов для отображения.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16338,103 +16338,123 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Задать ревизию порядковым номером</translation> + <translation type="obsolete">Задать ревизию порядковым номером</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Номер</translation> + <translation type="obsolete">Номер</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Задайте номер ревизии</translation> + <translation type="obsolete">Задайте номер ревизии</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> - <translation>Задать ревизию идентификатором изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> - <source>Id:</source> - <translation></translation> + <translation type="obsolete">Задать ревизию идентификатором изменений</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Задайте идентификатор изменений</translation> + <translation type="obsolete">Задайте идентификатор изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Метка:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Введите имя метки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Ветвь:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Метка:</translation> + <source>Enter a branch name</source> + <translation>Введите имя ветви</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation>Не задавать конкретную ревизию</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Ревизия не выбрана</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation>Способ сжатия (не заполнять для способа по умолчанию)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Упаковать все изменения</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Упаковать все изменения</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Введите имя метки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Ветвь:</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Введите имя ветви</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Ревизия не выбрана</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation>Способ сжатия (не заполнять для способа по умолчанию)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Упаковать все изменения</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Упаковать все изменения</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17445,105 +17465,105 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation>Предки: {0}<br /> -</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> -</source> - <translation><i>Автор: {0}</i><br /> -</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation>Предки: {0}<br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation><i>Автор: {0}</i><br /> +</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17658,6 +17678,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Задать ревизию с помощью метки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Метка:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Введите имя метки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Ветвь:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Введите имя ветви</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18699,12 +18802,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> - <translation>Пропустить текущие изменения</translation> + <translation type="obsolete">Пропустить текущие изменения</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> + <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> @@ -18956,6 +19059,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35173,223 +35291,223 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>Импорт проекта в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>Закрузка из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Тег должен быть обычным тегом (tag) или ветвью (branch). Пожалуйста, выберите из списка.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>Загрузка проекта из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>Экспорт из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>Фиксация изменений в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Создать проект в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Невозможно создать проект в репозитории. Возможно данный репозиторий не существует или сервер не функционирует.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -35544,48 +35662,48 @@ <translation>нет версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation>Процесс svn завершился с кодом {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -41980,68 +42098,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -49083,17 +49196,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -49104,30 +49217,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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> @@ -49137,7 +49250,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49154,7 +49267,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -49398,17 +49511,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_tr.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_tr.ts Sun Sep 04 15:17:10 2011 +0200 @@ -15620,262 +15620,262 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Mercurial Log</source> - <translation>Mercurial Günlüğü</translation> + <translation type="obsolete">Mercurial Günlüğü</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation>Gösterilecek giriş sayısını seçiniz.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <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="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <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="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <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="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -16466,103 +16466,123 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation>Gözden geçirme numarasının açıkça belirtmeyi seç</translation> + <translation type="obsolete">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation>Numara</translation> + <translation type="obsolete">Numara</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation>Gözden geçirme numarası gir</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Gözden geçirme numarası gir</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> <source>Id:</source> - <translation>Id:</translation> + <translation type="obsolete">Id:</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> <source>Enter a changeset id</source> - <translation>Değişiklik set kimliğini gir</translation> + <translation type="obsolete">Değişiklik set kimliğini gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation>Etiket:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation>Etiket adı gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> + <translation>Sınıf(Branş):</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> - <translation>Etiket:</translation> + <source>Enter a branch name</source> + <translation>Bir branş adı giriniz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation>Seçilmiş gözden geçirme yok</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation>Tüm değişiklik setlerini destelemek için seç</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation>Tüm değişiklik setlerini destele</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation>Etiket adı gir</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation>Sınıf(Branş):</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation>Bir branş adı giriniz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation>Seçilmiş gözden geçirme yok</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation>Tüm değişiklik setlerini destelemek için seç</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation>Tüm değişiklik setlerini destele</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -17574,96 +17594,96 @@ <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation>{0}ne farkı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> + <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -17778,6 +17798,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Gözden Geçirme</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished">Etiket:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished">Etiket adı gir</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished">Sınıf(Branş):</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished">Bir branş adı giriniz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -18822,16 +18925,6 @@ <translation>Atla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip the current changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Başadön</translation> @@ -19021,6 +19114,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -35316,270 +35424,270 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>Bilgi havuzunda proje oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Proje bilgi havuzunda oluşturulamadı. Belki verilen bilgi havuzu yoktur yada bilgi havuzunun serveri bozuktur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>Yeni Proje</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Proje bilgi havuzundan kontrol edilemiyor.<br />Orjinal içerik eski haline getiriliyor.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>Altsürüm Kontrolü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>Altsürüm Dışaaktarma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -42057,68 +42165,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -49156,24 +49259,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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> @@ -49182,7 +49285,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49199,23 +49302,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <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="1680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1699"/> <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="1683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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> @@ -49226,7 +49329,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -49470,17 +49573,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> - <source>unknown</source> - <translation>bilinmeyen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <source>unknown</source> + <translation>bilinmeyen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Sep 03 17:13:31 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun Sep 04 15:17:10 2011 +0200 @@ -16737,262 +16737,257 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <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="245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="302"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="517"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="569"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="634"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="698"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="838"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> - <source>Mercurial Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="722"/> <source>Select number of entries to show.</source> - <translation type="unfinished">选择要显示的条目数。</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> + <translation type="obsolete">选择要显示的条目数。</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1618"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1850"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> <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="2225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2283"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> <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="2306"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2328"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <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="465"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="466"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> <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="2457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -17583,103 +17578,113 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> <source>Select to specify a revision by number</source> - <translation type="unfinished">选择通过号码指定一个修订</translation> + <translation type="obsolete">选择通过号码指定一个修订</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> <source>Number</source> - <translation type="unfinished">号码</translation> + <translation type="obsolete">号码</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> <source>Enter a revision number</source> - <translation type="unfinished">输入一个修订号</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> - <source>Id:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> - <source>Enter a changeset id</source> + <translation type="obsolete">输入一个修订号</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="68"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="78"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="81"/> + <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> - <source>Tag:</source> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="130"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="133"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="185"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="194"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="197"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="101"/> + <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> - <source>Enter a tag name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> - <source>Branch:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> - <source>Enter a branch name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="169"/> - <source>No revision selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="182"/> - <source>Select the compression type (empty for default)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="189"/> - <source>Select to bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="192"/> - <source>Bundle all changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="120"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify multiple revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Multiple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="148"/> + <source>Base Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="172"/> + <source>Compression:</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> @@ -18701,96 +18706,96 @@ <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="181"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="264"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="297"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> - <source><i>Author: {0}</i><br /> + <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="331"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> - <source>Could not start the hg executable.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="327"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -18905,6 +18910,89 @@ </message> </context> <context> + <name>HgMultiRevisionSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">修订</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="29"/> + <source>Select to specify a list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Changesets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="58"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="74"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="84"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="87"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="103"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="113"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="116"/> + <source>Bookmark:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="132"/> + <source>Enter a bookmark name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="145"/> + <source>Limit Results</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="157"/> + <source>Enter number of entries to show:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgNewProjectOptionsDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="14"/> @@ -19909,16 +19997,6 @@ <translation type="unfinished">跳过</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip the current changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished">重置</translation> @@ -20168,6 +20246,21 @@ <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -38348,87 +38441,87 @@ <translation type="obsolete">svn 进程已由退出代码 %1 结束</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process did not finish within 30s.</source> <translation>svn 进程在 30 秒内不结束。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> <source>Could not start the svn executable.</source> <translation>无法开始 svn 执行。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>Create project in repository</source> <translation>在储存库中创建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="218"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="219"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>无法在储存库中创建项目。已给储存库可能不存在或储存库服务已关闭。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>New project</source> <translation>新建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="241"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>无法从储存库中校验项目。<br />恢复原始内容。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="311"/> <source>Importing project into Subversion repository</source> <translation>将项目导入到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="360"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="361"/> <source>Subversion Checkout</source> <translation>版本控制校验</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>标签必须是标准标签或分支标签。请从列表中选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="381"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="382"/> <source>Checking project out of Subversion repository</source> <translation>正在从版本控制储存库中检查项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="422"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="423"/> <source>Subversion Export</source> <translation>版本控制导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="442"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="443"/> <source>Exporting project from Subversion repository</source> <translation>正在从版本控制储存库中导出项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="526"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="527"/> <source>Commiting changes to Subversion repository</source> <translation>正在将改变提交到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="582"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="583"/> <source>Synchronizing with the Subversion repository</source> <translation>正在与版本控制储存库同步</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="657"/> <source>Adding files/directories to the Subversion repository</source> <translation>将文件或文件夹添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="730"/> <source>Adding directory trees to the Subversion repository</source> <translation>将目录树添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="764"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="765"/> <source>Removing files/directories from the Subversion repository</source> <translation>从版本控制储存库移除文件或文件夹</translation> </message> @@ -38438,17 +38531,17 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="930"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="931"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。标签操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="954"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="955"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。标签操作将被终止</translation> </message> @@ -38458,17 +38551,17 @@ <translation type="obsolete">在版本控制储存库中标记 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1018"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1019"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1069"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1070"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -38488,12 +38581,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1349"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1350"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1456"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1457"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -38503,72 +38596,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1596"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1613"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1614"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1433"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1443"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="867"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1779"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1780"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1818"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1862"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1863"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1888"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1889"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1912"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1913"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1948"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1949"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1938"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1939"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> @@ -38592,22 +38685,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1578"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1579"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1628"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1629"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1759"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1760"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -38777,53 +38870,53 @@ <translation>unversioned</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="189"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="826"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="827"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="989"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="990"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1091"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1092"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1193"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1194"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1314"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1495"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1496"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="326"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="327"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="552"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1098"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1099"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -45557,68 +45650,63 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="40"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="57"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="80"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> <source>Select to transplant all changesets of the branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="83"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="90"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="100"/> - <source>Enter revisions to be skipped separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="107"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="33"/> - <source>Enter the revisions or revision ranges to be transplanted separated by a space character</source> + <location filename="Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> </context> @@ -53353,30 +53441,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> <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="1668"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1687"/> <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="1676"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> <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="1201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1220"/> <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="1231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53387,23 +53475,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1681"/> <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="1664"/> - <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="1680"/> - <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="1683"/> + <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="1699"/> + <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="1702"/> <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> @@ -53411,7 +53499,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1691"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -53660,7 +53748,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1390"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> <source>unknown</source> <translation>未知</translation> </message> @@ -53670,12 +53758,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1259"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1269"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1392"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
