Mercurial Repositories > eric / changeset
changeset
Added dialogs to enter the contents for initial .hgrc/mercurial.ini and .hg/hgrc files.
Sun, 26 Jan 2014 15:49:14 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 26 Jan 2014 15:49:14 +0100
- changeset 3231
- a7c9914d1c41
- parent 3230
- 2beb981f3b6d
- child 3232
- c2e2ca23c86b
Added dialogs to enter the contents for initial .hgrc/mercurial.ini and .hg/hgrc files.
--- a/APIs/Python3/eric5.api Sat Jan 25 18:10:09 2014 +0100 +++ b/APIs/Python3/eric5.api Sun Jan 26 15:49:14 2014 +0100 @@ -4382,8 +4382,6 @@ eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage?1(plugin) -eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.MercurialUserDataDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.MercurialUserDataDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.HgFetchDialog?1(parent=None) @@ -4619,6 +4617,10 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.HgRemoveSubrepositoriesDialog.on_removeButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.HgRemoveSubrepositoriesDialog.on_subrepositories_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.HgRemoveSubrepositoriesDialog?1(subrepositories, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked?4(checked) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.HgRepoConfigDataDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -4692,6 +4694,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_currentIndexChanged?4(index) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, revision=None, tagName=None, parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog.getData?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.HgUserConfigDataDialog?1(version=(0, 0), parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="") eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenu?5(mainMenu)
--- a/APIs/Python3/eric5.bas Sat Jan 25 18:10:09 2014 +0100 +++ b/APIs/Python3/eric5.bas Sun Jan 26 15:49:14 2014 +0100 @@ -341,6 +341,7 @@ HgQueuesRenamePatchDialog QDialog Ui_HgQueuesRenamePatchDialog HgRebaseDialog QDialog Ui_HgRebaseDialog HgRemoveSubrepositoriesDialog QDialog Ui_HgRemoveSubrepositoriesDialog +HgRepoConfigDataDialog QDialog Ui_HgRepoConfigDataDialog HgRevisionSelectionDialog QDialog Ui_HgRevisionSelectionDialog HgRevisionsSelectionDialog QDialog Ui_HgRevisionsSelectionDialog HgServeDialog E5MainWindow @@ -349,6 +350,7 @@ HgSummaryDialog QDialog Ui_HgSummaryDialog HgTagBranchListDialog QDialog Ui_HgTagBranchListDialog HgTagDialog QDialog Ui_HgTagDialog +HgUserConfigDataDialog QDialog Ui_HgUserConfigDataDialog HighlightingStylesReader XMLStreamReaderBase HighlightingStylesWriter XMLStreamWriterBase HistoryCompleter QCompleter @@ -436,7 +438,6 @@ LogViewerEdit QTextEdit MasterPasswordEntryDialog QDialog Ui_MasterPasswordEntryDialog MercurialPage ConfigurationPageBase Ui_MercurialPage -MercurialUserDataDialog QDialog Ui_MercurialUserDataDialog MessageBoxWizard QObject MessageBoxWizardDialog QDialog Ui_MessageBoxWizardDialog MiniEditor E5MainWindow
--- a/Documentation/Help/source.qhp Sat Jan 25 18:10:09 2014 +0100 +++ b/Documentation/Help/source.qhp Sun Jan 26 15:49:14 2014 +0100 @@ -493,7 +493,6 @@ </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> - <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html" /> </section> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.html"> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html" /> @@ -561,6 +560,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html" /> @@ -569,6 +569,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" /> @@ -6412,6 +6413,12 @@ <keyword name="HgRemoveSubrepositoriesDialog.getData" id="HgRemoveSubrepositoriesDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html#HgRemoveSubrepositoriesDialog.getData" /> <keyword name="HgRemoveSubrepositoriesDialog.on_removeButton_clicked" id="HgRemoveSubrepositoriesDialog.on_removeButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html#HgRemoveSubrepositoriesDialog.on_removeButton_clicked" /> <keyword name="HgRemoveSubrepositoriesDialog.on_subrepositories_itemSelectionChanged" id="HgRemoveSubrepositoriesDialog.on_subrepositories_itemSelectionChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html#HgRemoveSubrepositoriesDialog.on_subrepositories_itemSelectionChanged" /> + <keyword name="HgRepoConfigDataDialog" id="HgRepoConfigDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html#HgRepoConfigDataDialog" /> + <keyword name="HgRepoConfigDataDialog (Constructor)" id="HgRepoConfigDataDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html#HgRepoConfigDataDialog.__init__" /> + <keyword name="HgRepoConfigDataDialog (Module)" id="HgRepoConfigDataDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html" /> + <keyword name="HgRepoConfigDataDialog.getData" id="HgRepoConfigDataDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html#HgRepoConfigDataDialog.getData" /> + <keyword name="HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked" id="HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html#HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked" /> + <keyword name="HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked" id="HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html#HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked" /> <keyword name="HgRevisionSelectionDialog" id="HgRevisionSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog" /> <keyword name="HgRevisionSelectionDialog (Constructor)" id="HgRevisionSelectionDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html#HgRevisionSelectionDialog.__init__" /> <keyword name="HgRevisionSelectionDialog (Module)" id="HgRevisionSelectionDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html" /> @@ -6550,6 +6557,10 @@ <keyword name="HgTagDialog.getParameters" id="HgTagDialog.getParameters" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog.getParameters" /> <keyword name="HgTagDialog.on_tagCombo_currentIndexChanged" id="HgTagDialog.on_tagCombo_currentIndexChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog.on_tagCombo_currentIndexChanged" /> <keyword name="HgTagDialog.on_tagCombo_editTextChanged" id="HgTagDialog.on_tagCombo_editTextChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog.on_tagCombo_editTextChanged" /> + <keyword name="HgUserConfigDataDialog" id="HgUserConfigDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog" /> + <keyword name="HgUserConfigDataDialog (Constructor)" id="HgUserConfigDataDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog.__init__" /> + <keyword name="HgUserConfigDataDialog (Module)" id="HgUserConfigDataDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html" /> + <keyword name="HgUserConfigDataDialog.getData" id="HgUserConfigDataDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html#HgUserConfigDataDialog.getData" /> <keyword name="HgUtilities (Module)" id="HgUtilities (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" /> <keyword name="HighlightingStylesReader" id="HighlightingStylesReader" ref="eric5.E5XML.HighlightingStylesReader.html#HighlightingStylesReader" /> <keyword name="HighlightingStylesReader (Constructor)" id="HighlightingStylesReader (Constructor)" ref="eric5.E5XML.HighlightingStylesReader.html#HighlightingStylesReader.__init__" /> @@ -7616,10 +7627,6 @@ <keyword name="MercurialPage (Module)" id="MercurialPage (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> <keyword name="MercurialPage.on_configButton_clicked" id="MercurialPage.on_configButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.on_configButton_clicked" /> <keyword name="MercurialPage.save" id="MercurialPage.save" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.save" /> - <keyword name="MercurialUserDataDialog" id="MercurialUserDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html#MercurialUserDataDialog" /> - <keyword name="MercurialUserDataDialog (Constructor)" id="MercurialUserDataDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html#MercurialUserDataDialog.__init__" /> - <keyword name="MercurialUserDataDialog (Module)" id="MercurialUserDataDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html" /> - <keyword name="MercurialUserDataDialog.getData" id="MercurialUserDataDialog.getData" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html#MercurialUserDataDialog.getData" /> <keyword name="Message" id="Message" ref="eric5.Utilities.pyflakes.messages.html#Message" /> <keyword name="Message" id="Message" ref="eric5.UtilitiesPython2.py2flakes.messages.html#Message" /> <keyword name="Message (Constructor)" id="Message (Constructor)" ref="eric5.Utilities.pyflakes.messages.html#Message.__init__" /> @@ -13905,7 +13912,6 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.bookmarks.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> - <file>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.HgFetchDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.FetchExtension.fetch.html</file> @@ -13938,6 +13944,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html</file> @@ -13946,6 +13953,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html</file>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html Sat Jan 25 18:10:09 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog</title> -<meta charset="UTF-8"> -<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.ConfigurationPage.MercurialUserDataDialog</h1> -<p> -Module implementing a dialog to enter the user data for a minimal hgrc file. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#MercurialUserDataDialog">MercurialUserDataDialog</a></td> -<td>Class implementing a dialog to enter the user data for a minimal hgrc file.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="MercurialUserDataDialog" ID="MercurialUserDataDialog"></a> -<h2>MercurialUserDataDialog</h2> -<p> - Class implementing a dialog to enter the user data for a minimal hgrc file. -</p> -<h3>Derived from</h3> -QDialog, Ui_MercurialUserDataDialog -<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="#MercurialUserDataDialog.__init__">MercurialUserDataDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#MercurialUserDataDialog.getData">getData</a></td> -<td>Public method to retrieve the data.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="MercurialUserDataDialog.__init__" ID="MercurialUserDataDialog.__init__"></a> -<h4>MercurialUserDataDialog (Constructor)</h4> -<b>MercurialUserDataDialog</b>(<i>parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>parent</i></dt> -<dd> -reference to the parent widget (QWidget) -</dd> -</dl><a NAME="MercurialUserDataDialog.getData" ID="MercurialUserDataDialog.getData"></a> -<h4>MercurialUserDataDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to retrieve the data. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple containing the user name and the user email address - (string, string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,115 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog</title> +<meta charset="UTF-8"> +<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.HgRepoConfigDataDialog</h1> +<p> +Module implementing a dialog to enter data needed for the initial creation +of a repository configuration file (hgrc). +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgRepoConfigDataDialog">HgRepoConfigDataDialog</a></td> +<td>Class implementing a dialog to enter data needed for the initial creation of a repository configuration file (hgrc).</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgRepoConfigDataDialog" ID="HgRepoConfigDataDialog"></a> +<h2>HgRepoConfigDataDialog</h2> +<p> + Class implementing a dialog to enter data needed for the initial creation + of a repository configuration file (hgrc). +</p> +<h3>Derived from</h3> +QDialog, Ui_HgRepoConfigDataDialog +<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="#HgRepoConfigDataDialog.__init__">HgRepoConfigDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgRepoConfigDataDialog.getData">getData</a></td> +<td>Public method to get the data entered into the dialog.</td> +</tr><tr> +<td><a href="#HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked">on_defaultPushShowPasswordButton_clicked</a></td> +<td>Private slot to switch the default password visibility of the default push password.</td> +</tr><tr> +<td><a href="#HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked">on_defaultShowPasswordButton_clicked</a></td> +<td>Private slot to switch the default password visibility of the default password.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgRepoConfigDataDialog.__init__" ID="HgRepoConfigDataDialog.__init__"></a> +<h4>HgRepoConfigDataDialog (Constructor)</h4> +<b>HgRepoConfigDataDialog</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgRepoConfigDataDialog.getData" ID="HgRepoConfigDataDialog.getData"></a> +<h4>HgRepoConfigDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the data entered into the dialog. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple giving the default and default push URLs (tuple of + two strings) +</dd> +</dl><a NAME="HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked" ID="HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked"></a> +<h4>HgRepoConfigDataDialog.on_defaultPushShowPasswordButton_clicked</h4> +<b>on_defaultPushShowPasswordButton_clicked</b>(<i>checked</i>) +<p> + Private slot to switch the default password visibility + of the default push password. +</p><a NAME="HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked" ID="HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked"></a> +<h4>HgRepoConfigDataDialog.on_defaultShowPasswordButton_clicked</h4> +<b>on_defaultShowPasswordButton_clicked</b>(<i>checked</i>) +<p> + Private slot to switch the default password visibility + of the default password. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,96 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog</title> +<meta charset="UTF-8"> +<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.HgUserConfigDataDialog</h1> +<p> +Module implementing a dialog to enter some user data. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgUserConfigDataDialog">HgUserConfigDataDialog</a></td> +<td>Class implementing a dialog to enter some user data.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgUserConfigDataDialog" ID="HgUserConfigDataDialog"></a> +<h2>HgUserConfigDataDialog</h2> +<p> + Class implementing a dialog to enter some user data. +</p> +<h3>Derived from</h3> +QDialog, Ui_HgUserConfigDataDialog +<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="#HgUserConfigDataDialog.__init__">HgUserConfigDataDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgUserConfigDataDialog.getData">getData</a></td> +<td>Public method to retrieve the entered data.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgUserConfigDataDialog.__init__" ID="HgUserConfigDataDialog.__init__"></a> +<h4>HgUserConfigDataDialog (Constructor)</h4> +<b>HgUserConfigDataDialog</b>(<i>version=(0, 0), parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to the parent widget (QWidget) +</dd> +</dl><a NAME="HgUserConfigDataDialog.getData" ID="HgUserConfigDataDialog.getData"></a> +<h4>HgUserConfigDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to retrieve the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple with user's first name, last name, email address and + list of activated extensions (tuple of three strings and a list + of strings) +</dd> +</dl> +<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.ConfigurationPage.html Sat Jan 25 18:10:09 2014 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html Sun Jan 26 15:49:14 2014 +0100 @@ -30,9 +30,6 @@ <tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html">MercurialPage</a></td> <td>Module implementing the Mercurial configuration page.</td> -</tr><tr> -<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialUserDataDialog.html">MercurialUserDataDialog</a></td> -<td>Module implementing a dialog to enter the user data for a minimal hgrc file.</td> </tr> </table> </body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sat Jan 25 18:10:09 2014 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Sun Jan 26 15:49:14 2014 +0100 @@ -137,6 +137,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgRemoveSubrepositoriesDialog.html">HgRemoveSubrepositoriesDialog</a></td> <td>Module implementing a dialog to remove sub-repositories.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgRepoConfigDataDialog.html">HgRepoConfigDataDialog</a></td> +<td>Module implementing a dialog to enter data needed for the initial creation of a repository configuration file (hgrc).</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html">HgRevisionSelectionDialog</a></td> <td>Module implementing a dialog to select a revision.</td> </tr><tr> @@ -161,6 +164,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html">HgTagDialog</a></td> <td>Module implementing a dialog to enter the data for a tagging operation.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDataDialog.html">HgUserConfigDataDialog</a></td> +<td>Module implementing a dialog to enter some user data.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html">HgUtilities</a></td> <td>Module implementing some common utility functions for the Mercurial package.</td> </tr><tr>
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Jan 25 18:10:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jan 26 15:49:14 2014 +0100 @@ -76,21 +76,22 @@ from QScintilla.MiniEditor import MiniEditor cfgFile = self.__plugin.getConfigPath() if not os.path.exists(cfgFile): - username = "" - from .MercurialUserDataDialog import MercurialUserDataDialog - dlg = MercurialUserDataDialog() + from ..HgUserConfigDataDialog import HgUserConfigDataDialog + dlg = HgUserConfigDataDialog() if dlg.exec_() == QDialog.Accepted: - name, email = dlg.getData() - if name and email: - username = "{0} <{1}>".format(name, email) - elif name: - username = name - elif email: - username = email + firstName, lastName, email, extensions = dlg.getData() + else: + firstName, lastName, email, extensions = ( + "Firstname", "Lastname", "email_address", []) try: f = open(cfgFile, "w") - f.write(os.linesep.join(["[ui]", - "username = {0}".format(username), ""])) + f.write("[ui]\n") + f.write("username = {0} {1} <{2}>\n".format( + firstName, lastName, email)) + if extensions: + f.write("\n[extensions]\n") + f.write(" =\n".join(extensions)) + f.write(" =\n") # complete the last line f.close() except (IOError, OSError): # ignore these
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py Sat Jan 25 18:10:09 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2013 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter the user data for a minimal hgrc file. -""" - -from PyQt4.QtGui import QDialog - -from .Ui_MercurialUserDataDialog import Ui_MercurialUserDataDialog - - -class MercurialUserDataDialog(QDialog, Ui_MercurialUserDataDialog): - """ - Class implementing a dialog to enter the user data for a minimal hgrc file. - """ - def __init__(self, parent=None): - """ - Constructor - - @param parent reference to the parent widget (QWidget) - """ - super().__init__(parent) - self.setupUi(self) - - def getData(self): - """ - Public method to retrieve the data. - - @return tuple containing the user name and the user email address - (string, string) - """ - return self.usernameEdit.text(), self.emailEdit.text()
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui Sat Jan 25 18:10:09 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MercurialUserDataDialog</class> - <widget class="QDialog" name="MercurialUserDataDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>106</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial User Data</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>&Username:</string> - </property> - <property name="buddy"> - <cstring>usernameEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="usernameEdit"> - <property name="toolTip"> - <string>Enter the name of the user (first name and last name)</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>&Email:</string> - </property> - <property name="buddy"> - <cstring>emailEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="emailEdit"> - <property name="toolTip"> - <string>Enter the email address</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>MercurialUserDataDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>MercurialUserDataDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- + +""" +Module implementing a dialog to enter data needed for the initial creation +of a repository configuration file (hgrc). +""" + +from PyQt4.QtCore import pyqtSlot, QUrl +from PyQt4.QtGui import QDialog, QLineEdit + +from .Ui_HgRepoConfigDataDialog import Ui_HgRepoConfigDataDialog + +import UI.PixmapCache + + +class HgRepoConfigDataDialog(QDialog, Ui_HgRepoConfigDataDialog): + """ + Class implementing a dialog to enter data needed for the initial creation + of a repository configuration file (hgrc). + """ + def __init__(self, parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + self.defaultShowPasswordButton.setIcon( + UI.PixmapCache.getIcon("showPassword.png")) + self.defaultPushShowPasswordButton.setIcon( + UI.PixmapCache.getIcon("showPassword.png")) + + self.resize(self.width(), self.minimumSizeHint().height()) + + @pyqtSlot(bool) + def on_defaultShowPasswordButton_clicked(self, checked): + """ + Private slot to switch the default password visibility + of the default password. + """ + if checked: + self.defaultPasswordEdit.setEchoMode(QLineEdit.Normal) + else: + self.defaultPasswordEdit.setEchoMode(QLineEdit.Password) + + @pyqtSlot(bool) + def on_defaultPushShowPasswordButton_clicked(self, checked): + """ + Private slot to switch the default password visibility + of the default push password. + """ + if checked: + self.defaultPushPasswordEdit.setEchoMode(QLineEdit.Normal) + else: + self.defaultPushPasswordEdit.setEchoMode(QLineEdit.Password) + + def getData(self): + """ + Public method to get the data entered into the dialog. + + @return tuple giving the default and default push URLs (tuple of + two strings) + """ + defaultUrl = QUrl.fromUserInput(self.defaultUrlEdit.text()) + username = self.defaultUserEdit.text() + password = self.defaultPasswordEdit.text() + if username: + defaultUrl.setUserName(username) + if password: + defaultUrl.setPassword(password) + if not defaultUrl.isValid(): + defaultUrl = "" + else: + defaultUrl = defaultUrl.toString() + + defaultPushUrl = QUrl.fromUserInput(self.defaultPushUrlEdit.text()) + username = self.defaultPushUserEdit.text() + password = self.defaultPushPasswordEdit.text() + if username: + defaultPushUrl.setUserName(username) + if password: + defaultPushUrl.setPassword(password) + if not defaultPushUrl.isValid(): + defaultPushUrl = "" + else: + defaultPushUrl = defaultPushUrl.toString() + + return defaultUrl, defaultPushUrl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,213 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgRepoConfigDataDialog</class> + <widget class="QDialog" name="HgRepoConfigDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>650</width> + <height>323</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Repository Configuration</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Default</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Upstream URL:</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="defaultUrlEdit"> + <property name="toolTip"> + <string>Enter the URL of the upstream repository</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="defaultUserEdit"> + <property name="toolTip"> + <string>Enter user name to acces the upstream repository</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="defaultPasswordEdit"> + <property name="toolTip"> + <string>Enter the password to acces the upstream repository</string> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="defaultShowPasswordButton"> + <property name="toolTip"> + <string>Press to show the password</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Default Push</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Upstream URL:</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="defaultPushUrlEdit"> + <property name="toolTip"> + <string>Enter the URL of the upstream (push) repository</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Username:</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="E5ClearableLineEdit" name="defaultPushUserEdit"> + <property name="toolTip"> + <string>Enter user name to acces the upstream (push) repository</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="defaultPushPasswordEdit"> + <property name="toolTip"> + <string>Enter the password to acces the upstream (push) repository</string> + </property> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QToolButton" name="defaultPushShowPasswordButton"> + <property name="toolTip"> + <string>Press to show the password</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </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> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>defaultUrlEdit</tabstop> + <tabstop>defaultUserEdit</tabstop> + <tabstop>defaultPasswordEdit</tabstop> + <tabstop>defaultShowPasswordButton</tabstop> + <tabstop>defaultPushUrlEdit</tabstop> + <tabstop>defaultPushUserEdit</tabstop> + <tabstop>defaultPushPasswordEdit</tabstop> + <tabstop>defaultPushShowPasswordButton</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgRepoConfigDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgRepoConfigDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- + +""" +Module implementing a dialog to enter some user data. +""" + +from PyQt4.QtGui import QDialog + +from .Ui_HgUserConfigDataDialog import Ui_HgUserConfigDataDialog + + +class HgUserConfigDataDialog(QDialog, Ui_HgUserConfigDataDialog): + """ + Class implementing a dialog to enter some user data. + """ + def __init__(self, version=(0, 0), parent=None): + """ + Constructor + + @param parent reference to the parent widget (QWidget) + """ + super().__init__(parent) + self.setupUi(self) + + if version >= (1, 8): + self.bookmarksCheckBox.setEnabled(False) + if version >= (2, 3): + self.transplantCheckBox.setEnabled(False) + + self.resize(self.width(), self.minimumSizeHint().height()) + + def getData(self): + """ + Public method to retrieve the entered data. + + @return tuple with user's first name, last name, email address and + list of activated extensions (tuple of three strings and a list + of strings) + """ + extensions = [] + + if self.bookmarksCheckBox.isChecked(): + extensions.append("bookmarks") + if self.fetchCheckBox.isChecked(): + extensions.append("fetch") + if self.gpgCheckBox.isChecked(): + extensions.append("gpg") + if self.purgeCheckBox.isChecked(): + extensions.append("purge") + if self.queuesCheckBox.isChecked(): + extensions.append("mq") + if self.rebaseCheckBox.isChecked(): + extensions.append("rebase") + if self.transplantCheckBox.isChecked(): + extensions.append("transplant") + + return ( + self.firstNameEdit.text(), + self.lastNameEdit.text(), + self.emailEdit.text(), + extensions, + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui Sun Jan 26 15:49:14 2014 +0100 @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgUserConfigDataDialog</class> + <widget class="QDialog" name="HgUserConfigDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>346</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial User Data</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>User Data</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>First Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="firstNameEdit"> + <property name="toolTip"> + <string>Enter the first name</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Last Name:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5ClearableLineEdit" name="lastNameEdit"> + <property name="toolTip"> + <string>Enter the last name</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Email:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5ClearableLineEdit" name="emailEdit"> + <property name="toolTip"> + <string>Enter the email address</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Extensions</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QCheckBox" name="bookmarksCheckBox"> + <property name="toolTip"> + <string>Select to activate the bookmarks extension</string> + </property> + <property name="text"> + <string>Bookmarks</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="fetchCheckBox"> + <property name="toolTip"> + <string>Select to activate the fetch extension</string> + </property> + <property name="text"> + <string>Fetch</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="gpgCheckBox"> + <property name="toolTip"> + <string>Select to activate the GPG extension</string> + </property> + <property name="text"> + <string>GPG</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="purgeCheckBox"> + <property name="toolTip"> + <string>Select to activate the Purge extension</string> + </property> + <property name="text"> + <string>Purge</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="queuesCheckBox"> + <property name="toolTip"> + <string>Select to activate the queues extension</string> + </property> + <property name="text"> + <string>Queues</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="rebaseCheckBox"> + <property name="toolTip"> + <string>Select to activate the rebase extension</string> + </property> + <property name="text"> + <string>Rebase</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="transplantCheckBox"> + <property name="toolTip"> + <string>Select to activate the transplant extension</string> + </property> + <property name="text"> + <string>Transplant</string> + </property> + </widget> + </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> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>firstNameEdit</tabstop> + <tabstop>lastNameEdit</tabstop> + <tabstop>emailEdit</tabstop> + <tabstop>bookmarksCheckBox</tabstop> + <tabstop>fetchCheckBox</tabstop> + <tabstop>gpgCheckBox</tabstop> + <tabstop>purgeCheckBox</tabstop> + <tabstop>queuesCheckBox</tabstop> + <tabstop>rebaseCheckBox</tabstop> + <tabstop>transplantCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgUserConfigDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgUserConfigDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Jan 25 18:10:09 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Jan 26 15:49:14 2014 +0100 @@ -2170,11 +2170,23 @@ from .HgUtilities import getConfigPath cfgFile = getConfigPath() if not os.path.exists(cfgFile): + # open dialog to enter the initial data + from .HgUserConfigDataDialog import HgUserConfigDataDialog + dlg = HgUserConfigDataDialog(version=self.version) + if dlg.exec_() == QDialog.Accepted: + firstName, lastName, email, extensions = dlg.getData() + else: + firstName, lastName, email, extensions = ( + "Firstname", "Lastname", "email_address", []) try: - # TODO: open a dialog to ask for the basic data f = open(cfgFile, "w") - f.write("[ui]\nusername = Firstname Lastname" - " <email_address>\n") + f.write("[ui]\n") + f.write("username = {0} {1} <{2}>\n".format( + firstName, lastName, email)) + if extensions: + f.write("\n[extensions]\n") + f.write(" =\n".join(extensions)) + f.write(" =\n") # complete the last line f.close() except (IOError, OSError): # ignore these @@ -2199,10 +2211,24 @@ cfgFile = os.path.join(repodir, self.adminDir, "hgrc") if not os.path.exists(cfgFile): + # open dialog to enter the initial data + from .HgRepoConfigDataDialog import HgRepoConfigDataDialog + dlg = HgRepoConfigDataDialog() + if dlg.exec_() == QDialog.Accepted: + createContents = True + defaultUrl, defaultPushUrl = dlg.getData() + else: + createContents = False try: - # TODO: open a dialog to enter the basic data - # default and default-push cfg = open(cfgFile, "w") + if createContents: + # write the data entered + cfg.write("[paths]\n") + if defaultUrl: + cfg.write("default = {0}\n".format(defaultUrl)) + if defaultPushUrl: + cfg.write("default-push = {0}\n".format( + defaultPushUrl)) cfg.close() self.__monitorRepoIniFile(repodir) except IOError:
--- a/changelog Sat Jan 25 18:10:09 2014 +0100 +++ b/changelog Sun Jan 26 15:49:14 2014 +0100 @@ -14,6 +14,8 @@ -- Mercurial --- enhanced the tag dialog and extended the log browser to allow tagging of a specific revision + --- added dialogs to enter the contents for initial .hgrc/mercurial.ini + and .hg/hgrc files Version 5.4.0: - bug fixes
--- a/eric5.e4p Sat Jan 25 18:10:09 2014 +0100 +++ b/eric5.e4p Sun Jan 26 15:49:14 2014 +0100 @@ -1086,7 +1086,6 @@ <Source>ThirdParty/Jasy/jasy/js/tokenize/Tokenizer.py</Source> <Source>ThirdParty/Jasy/jasy/js/tokenize/__init__.py</Source> <Source>ThirdParty/Jasy/jasy/js/tokenize/Lang.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py</Source> <Source>Plugins/CheckerPlugins/CodeStyleChecker/__init__.py</Source> @@ -1111,6 +1110,8 @@ <Source>Utilities/pyflakes/checker.py</Source> <Source>Utilities/pyflakes/messages.py</Source> <Source>Utilities/pyflakes/translations.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1425,12 +1426,13 @@ <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui</Form> <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.ui</Form> <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui</Form> <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.ui</Form> <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.ui</Form> <Form>Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui</Form> + <Form>Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.ts</Translation>
--- a/i18n/eric5_cs.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_cs.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13644,17 +13644,17 @@ <translation>Seznam jmen bázových adresářů, které budou ignorovány</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Vybrat výstupní soubor</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>API soubory (*.api);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Vybrat adresář, který bude vyloučen</translation> </message> @@ -14029,22 +14029,22 @@ <translation type="obsolete"><?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>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Hlavička první úrovně</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Hlavička druhé úrovně</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Hlavička třídy a funkce</h2>Standardní text s různými <a style="color:%(LinkColor)s">odkazy</a> v textu.</body></html></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Výběr výstupního adresáře</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Vybrat adresář, který bude vyloučen</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Vybrat CSS soubor</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Style sheet (*.css);;Všechny soubory (*)</translation> </message> @@ -14124,7 +14124,7 @@ <translation>Zadejte krátký titulek pro vstup nahoře</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Vybrat výstupní adresář pro soubory QtNápovědy</translation> </message> @@ -19891,27 +19891,27 @@ <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <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="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> @@ -19921,52 +19921,52 @@ <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <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="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -19976,37 +19976,37 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <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="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20016,72 +20016,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20111,7 +20111,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20433,102 +20433,102 @@ <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Zadejte id množiny změn</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Vybrat pro specifikaci revize tagem</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.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/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <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/HgBackoutDialog.ui" line="120"/> - <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/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation>Vybrat pro specifikaci konkrétní revize</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation>Vybrat pro specifikaci konkrétní revize</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>Nebyla vybrána revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Zapsat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Zpráva zápisu změn:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Zadejte zprávu pro zápis změn (commit) nebo ponechte prázdné pro použití výhozí hodnoty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Datum zápisu změn:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Zadejte nepovinné datum pro zápis změn (commit)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Autor zápisu změn:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Zadejte nepovinného uživatele pro zápis změn (commit)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Vybrat pro merge s rodičem složky projektu</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Vybrat pro merge s rodičem složky projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Merge s aktuálním rodičem</translation> </message> @@ -20538,17 +20538,17 @@ <translation>Zálohovat množinu změn <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -20596,72 +20596,72 @@ <translation type="unfinished">Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished">Zadejte id množiny změn</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished">Zadejte jméno tagu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished">Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished">Zadejte jméno větve</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> @@ -21600,122 +21600,122 @@ <translation type="unfinished">Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished">Zadejte id množiny změn</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished">Zadejte jméno tagu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished">Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished">Zadejte jméno větve</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -22577,82 +22577,82 @@ <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Zadejte id množiny změn</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Vybrat pro specifikaci revize tagem</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.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/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation>Neurčovat konkrétní revizi</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Neurčovat konkrétní revizi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Nebyla vybrána revize</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Vybrat pro vynucení operace merge</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Vybrat pro vynucení operace merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Vynutit merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -24950,132 +24950,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished">Číslo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished">Zadejte id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished">Zadejte jméno tagu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished">Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished">Zadejte jméno větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished">Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25109,6 +25109,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Heslo:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -25136,57 +25204,57 @@ <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Zadejte id množiny změn</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Vybrat pro specifikaci revize tagem</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.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/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <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/HgRevisionSelectionDialog.ui" line="120"/> - <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/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Vybrat poslední revizi (tip) v repozitáři</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Vybrat poslední revizi (tip) v repozitáři</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -25201,17 +25269,17 @@ <translation>Vybrat pro specifikaci konkrétní revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25229,102 +25297,102 @@ <translation>Revize &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation>Vybrat pro zadání revize číslem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Zadejte číslo revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation>Vybrat pro zadání revize přes id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Zadejte id množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation>Vybrat pro specifikaci revize tagem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Zadejte jméno tagu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <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/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Větev:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Zadejte jméno větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation>Vybrat poslední revizi (tip) v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Vybrat revizi před posledním zapsáním změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Revize &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -26233,6 +26301,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -31732,29 +31918,14 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation type="unfinished">&Uživatelské jméno:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Uživatelské jméno:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Email:</translation> </message> </context> <context>
--- a/i18n/eric5_de.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_de.ts Sun Jan 26 15:49:14 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1939,8 +1938,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -2176,8 +2175,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -13017,12 +13016,12 @@ <context> <name>EricapiConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Wähle eine Ausgabedatei</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Wähle ein zu ignorierendes Verzeichnis</translation> </message> @@ -13112,7 +13111,7 @@ <translation>Liste von zu ignorierenden Verzeichnisnamen</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>API-Dateien (*.api);;Alle Dateien (*)</translation> </message> @@ -13244,22 +13243,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Wähle ein Ausgabeverzeichnis</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Wähle ein zu ignorierendes Verzeichnis</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Style Sheet (*.css);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Wähle ein CSS Style Sheet</translation> </message> @@ -13554,7 +13553,7 @@ <translation>Gib einen Kurztitel für den obersten Eintrag ein</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Wähle das Verzeichnis für die QtHelp-Dateien</translation> </message> @@ -15846,8 +15845,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19046,27 +19045,27 @@ <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <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="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> @@ -19076,87 +19075,87 @@ <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <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="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19166,72 +19165,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19261,7 +19260,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -19578,102 +19577,102 @@ <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <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/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <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/HgBackoutDialog.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/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <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/HgBackoutDialog.ui" line="120"/> - <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/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <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/HgBackoutDialog.ui" line="178"/> - <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/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>Keine Revision ausgewählt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Änderungsdaten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Änderungsbeschreibung:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Gib die Änderungsbeschreibung ein oder lasse es leer, um den Standardtext zu verwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Datum für Änderung:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Gib das optionale Datum der Änderung ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Nutzer für Änderung:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Gib den optionalen Nutzer der Änderung ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Auswählen, um mit dem Vorgänger des Projektverzeichnisses zusammenzuführen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Auswählen, um mit dem Vorgänger des Projektverzeichnisses zusammenzuführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Mit aktuellem Vorgänger zusammenführen</translation> </message> @@ -19683,17 +19682,17 @@ <translation>Änderungssatz <{0}> umgekehrt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <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/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> @@ -19741,72 +19740,72 @@ <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <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/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation>Wähle neueste Revision des Repository</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation>Wähle neueste Revision des Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -20721,122 +20720,122 @@ <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <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/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <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/GpgExtension/HgGpgSignDialog.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/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Wähle neueste Revision des Repository</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Wähle neueste Revision des Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation>Änderungsbeschreibung</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation>Auswählen, um die Signatur nicht einzupflegen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation>Auswählen, um die Signatur nicht einzupflegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation>Nicht einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation>Gib eine Änderungsmitteilung ein (leer lassen, um einen Standardtext zu verwenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation>Schlüüsel-ID:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation>Gib die ID des zu verwendenden Schlüssels ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation>Auswählen. um eine lokale Signatur zu leisten</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation>Auswählen. um eine lokale Signatur zu leisten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation>Lokale Signatur</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation>Auswählen, um auch bei geänderter Signaturdatei eine Signatur zu leisten</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation>Auswählen, um auch bei geänderter Signaturdatei eine Signatur zu leisten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation>Signatur erzwingen</translation> </message> @@ -21701,82 +21700,82 @@ <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <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/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Keine Revision ausgewählt</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Auswählen, um die Vereinigungsoperation zu erzwingen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Auswählen, um die Vereinigungsoperation zu erzwingen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Vereinigung erzwingen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> @@ -23913,132 +23912,132 @@ <translation>&Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation>Auswählen, um eine Revision mit ihrer Änderungssatz-ID anzugeben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation>Auswählen, um eine Revision per Marke zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation>Auswählen, um eine Revision per Lesezeichen zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation>&Zielrevision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation>Auswählen, um die umgruppierten Änderungssätze zusammenzufassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation>Änderungssätze zusammenfassen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation>Auswählen, um die originalen Änderungssätze zu behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation>Originale Änderungssätze behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation>Auswählen, um die originalen Zweignamen zu behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation>Originale Zweignamen behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation>Auswählen, um die Quelle vom originalen Zweig zu trennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation>Quelle trennen</translation> </message> @@ -24072,6 +24071,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation>Mercurial Repository Konfiguration</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation>Default</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation>Übergeordnete URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation>Gib die URL des übergeordneten Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation>Gib den Nutzernamen zum Zugriff auf das übergeordnete Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation>Drücken, um das Kennwort anzuzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation>Default Push</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation>Gib die Push-URL des übergeordneten Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation>Gib den Nutzernamen zum Push-Zugriff auf das übergeordnete Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the password to acces the upstream repository</source> + <translation>Gib das Kennwort zum Zugriff auf das übergeordnete Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the password to acces the upstream (push) repository</source> + <translation>Gib das Kennwort zum Push-Zugriff auf das übergeordnete Repository ein</translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -24099,57 +24166,57 @@ <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <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/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <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/HgRevisionSelectionDialog.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/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <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/HgRevisionSelectionDialog.ui" line="120"/> - <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/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Wähle neueste Revision des Repository</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Wähle neueste Revision des Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -24164,17 +24231,17 @@ <translation>Auswählen, um keine spezifische Revision zu wählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <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/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> @@ -24192,102 +24259,102 @@ <translation>Revision &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <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/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Nummer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Gib eine Revisionsnummer ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <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/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Gib die Änderungssatz ID ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <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/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Marke:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <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/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Zweig:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Gib einen Zweignamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation>Wähle neueste Revision des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Wähle Revision for letztem Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Revision &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <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/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation>Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation>Gib einen Lesezeichennamen ein</translation> </message> @@ -25159,6 +25226,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation>Mercurial Nutzerdaten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation>Nutzer Daten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation>Vorname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation>Gib den Vornamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation>Nachname:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation>Gib den Nachnamen ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation>E-Mail:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation>Gib die Email Adresse ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation>Erweiterungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation>Auswählen, um die Lesezeichen Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation>Lesezeichen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation>Auswählen, um die Fetch Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation>Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation>GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation>Auswählen, um die Purge Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation>Purge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation>Patchschlangen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation>Umgruppieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation>Auswählen, um die Transplantation Erweiterung zu aktivieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation>Transplantation</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebase extension</source> + <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -30323,34 +30508,6 @@ </message> </context> <context> - <name>MercurialUserDataDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation>Mercurial Nutzerdaten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> - <source>&Username:</source> - <translation>&Benutzername:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation>Gib den Nutzernamen (Vorname und Nachname) ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> - <source>&Email:</source> - <translation>&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation>Gib die Email Adresse ein</translation> - </message> -</context> -<context> <name>MessageBoxWizard</name> <message> <location filename="../Plugins/PluginWizardQMessageBox.py" line="122"/> @@ -41487,11 +41644,6 @@ <translation>Drücken, um einen neuen Filter hinzuzufügen</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="64"/> - <source>Press to remove the selected filter</source> - <translation type="obsolete">Drücken, um den ausgewählten Filter zu löschen</translation> - </message> - <message> <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="128"/> <source>Add Filter</source> <translation>Filter hinzufügen</translation> @@ -41507,21 +41659,6 @@ <translation>Filter hinzufügen ...</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="67"/> - <source>Remove Filter</source> - <translation type="obsolete">Filter entfernen</translation> - </message> - <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="74"/> - <source>Press to remove the selected attribute</source> - <translation type="obsolete">Drücken, um das ausgewählte Attribut zu entfernen</translation> - </message> - <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="77"/> - <source>Remove Attribute</source> - <translation type="obsolete">Attribut entfernen</translation> - </message> - <message> <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="86"/> <source>Press to remove the selected filters</source> <translation>Drücken, um die ausgewählten Filter zu löschen</translation> @@ -56570,11 +56707,6 @@ <translation>Python 2-Interpreter wurde nicht innerhalb von 30s beendet.</translation> </message> <message> - <location filename="../Utilities/__init__.py" line="1423"/> - <source>Invalid data received from Python2 syntax checker.</source> - <translation type="obsolete">Ungültige Daten vom Python2 Syntaxprüfer erhalten.</translation> - </message> - <message> <location filename="../Utilities/__init__.py" line="1389"/> <source>Codingerror: {0}</source> <translation>Kodierungsfehler: {0}</translation> @@ -59863,11 +59995,6 @@ <translation>&Nächste Warnung</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3762"/> - <source><b>Next warning message</b><p>Go to next line of the current editor having a py3flakes warning.</p></source> - <translation type="obsolete"><b>Nächste Warnung</b><p>Gehe zur nächsten Zeile des aktuellen Editors, die eine py3flakes Warning besitzt.</p></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="3778"/> <source>Previous warning message</source> <translation>Vorherige Warnung</translation> @@ -59878,11 +60005,6 @@ <translation>&Vorherige Warnung</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3780"/> - <source><b>Previous warning message</b><p>Go to previous line of the current editor having a py3flakes warning.</p></source> - <translation type="obsolete"><b>Vorherige Warnung</b><p>Gehe zur vorherigen Zeile des aktuellen Editors, die eine py3flakes Warning besitzt.</p></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="3794"/> <source>Clear Warning Messages</source> <translation>Warnungen löschen</translation> @@ -59893,11 +60015,6 @@ <translation>&Warnungen löschen</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3796"/> - <source><b>Clear Warning Messages</b><p>Clear py3flakes warning messages of all editors.</p></source> - <translation type="obsolete"><b>Warnungen löschen</b><p>Löscht die py3flakes Warnungen aller Editoren.</p></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="940"/> <source>Join Lines</source> <translation>Zeilen verbinden</translation> @@ -61609,11 +61726,6 @@ <translation>Doppeltes Argument {0!r} in Funktionsdefinition.</translation> </message> <message> - <location filename="../Utilities/py3flakes/translations.py" line="40"/> - <source>Redefinition of function {0!r} from line {1!r}.</source> - <translation type="obsolete">Redefinition der Funktion {0!r} aus Zeile {1!r}.</translation> - </message> - <message> <location filename="../Utilities/pyflakes/translations.py" line="43"/> <source>Future import(s) {0!r} after other statements.</source> <translation>Future Import(s) {0!r} nach anderen Statements.</translation>
--- a/i18n/eric5_en.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_en.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13056,17 +13056,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation type="unfinished"></translation> </message> @@ -13459,27 +13459,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -18946,112 +18946,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19061,72 +19061,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19156,7 +19156,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19473,102 +19473,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation type="unfinished"></translation> </message> @@ -19578,17 +19578,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -19636,72 +19636,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -20592,122 +20592,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -21562,82 +21562,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -23765,132 +23765,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -23924,6 +23924,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -23951,57 +24019,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -24016,17 +24084,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -24044,102 +24112,102 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25005,6 +25073,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -30167,31 +30353,6 @@ </context> <context> <name>MercurialUserDataDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> - <source>&Username:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> - <source>&Email:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>MessageBoxWizard</name>
--- a/i18n/eric5_es.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_es.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13133,17 +13133,17 @@ <translation>Lista de nombres base de directorios a ignorar</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Seleccione archivo de salida</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>Archivos API (*.api);; Todos los archivos (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Seleccionar directorio a excluir</translation> </message> @@ -13477,22 +13477,22 @@ <translation>Esto es una muestra de los colores seleccionados.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Seleccionar Directorio de salida </translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Seleccionar directorios a excluir</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Seleccionar hoja de estilos CSS</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Hojas de estilos (*.css);; Todos los archivos (*)</translation> </message> @@ -13567,7 +13567,7 @@ <translation>Generar colección de archivos de QtHelp</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Seleccionar directorio de salida para los archivos de QtHelp</translation> </message> @@ -19045,27 +19045,27 @@ <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <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="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <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="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> @@ -19075,87 +19075,87 @@ <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <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="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <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="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <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> @@ -19165,72 +19165,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -19260,7 +19260,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -19577,102 +19577,102 @@ <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <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/HgBackoutDialog.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/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <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/HgBackoutDialog.ui" line="120"/> - <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/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <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/HgBackoutDialog.ui" line="178"/> - <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/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>No se ha seleccionado revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Hacer commit de los datos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Mensaje de commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Introduzca el mensaje de commit o deje en blanco para utilizar el mensaje por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Fecha de Commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Introduzca opcionalmente fecha para el commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Usuario de Commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Introduzca opcionalmente usuario para el commit</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Seleccione para hacer merge con el padre del directorio de proyecto</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Seleccione para hacer merge con el padre del directorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Hacer merge con padre actual</translation> </message> @@ -19682,17 +19682,17 @@ <translation>Se ha hecho un respaldo del changeset <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <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/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> @@ -19740,72 +19740,72 @@ <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation>Seleccionar revisión tip del repositorio</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation>Seleccionar revisión tip del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -20720,122 +20720,122 @@ <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <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/GpgExtension/HgGpgSignDialog.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/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Seleccionar revisión tip del repositorio</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Seleccionar revisión tip del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation>Mensaje de Commit</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation>Seleccionar para no hacer commit de la firma</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation>Seleccionar para no hacer commit de la firma</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation>No Hacer Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation>Introduzca el mensaje de commit (deje en blanco para utilizar el mensaje por defecto)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation>ID de Clave:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation>Introduzca el ID de la clave a utilizar</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation>Seleccionar para hacer local la firma</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation>Seleccionar para hacer local la firma</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation>Firma Local</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation>Seleccionar para firmar incluso si el archivo de firma está modificado</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation>Seleccionar para firmar incluso si el archivo de firma está modificado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation>Forzar Firma</translation> </message> @@ -21702,82 +21702,82 @@ <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>No se ha seleccionado revisión</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Seleccionar para forzar la operación merge</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Seleccionar para forzar la operación merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Imponer merge </translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> @@ -23914,132 +23914,132 @@ <translation>&Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation>Seleccionar para especificar una revisión por número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <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/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <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/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation>Seleccionar para especificar una revisión por marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation>Revisión &Destino</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation>Seleccionar revisión tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation>Seleccionar para colapsar los changesets con rebase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation>Colapsar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation>Seleccionar para mantener los changesets originales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation>Mantener Changesets Originales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation>Seleccionar para mantener los nombres de branch originales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation>Mantener el Nombre Original de Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation>Seleccionar para desacoplar la fuente de su branch original</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation>Desacoplar Fuente</translation> </message> @@ -24073,6 +24073,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">Por defecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Contraseña:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="29"/> @@ -24090,42 +24158,42 @@ <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <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/HgRevisionSelectionDialog.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/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Seleccionar revisión tip del repositorio</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Seleccionar revisión tip del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -24140,17 +24208,17 @@ <translation>Revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> <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/HgRevisionSelectionDialog.ui" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> @@ -24165,17 +24233,17 @@ <translation>Seleccionar para no especificar una revisión específica</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation>Seleccionar para especificar una revisión por marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> @@ -24193,102 +24261,102 @@ <translation>Revisión &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation>Seleccionar para especificar una revisión por número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Número</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Introduzca un número de revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation>Seleccionar para especificar una revisión por changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Introduzca un changeset id</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <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/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Introduzca un nombre de tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation>Seleccionar para especificar una revisión por una branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Introducir un nombre de branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation>Seleccionar revisión tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Seleccionar revisión antes del último commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Revisión &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation>Seleccionar para especificar una revisión por marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation>Marcador:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation>Introduzca un nombre de marcador</translation> </message> @@ -25160,6 +25228,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished">Datos de Usuario de Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished">Nombre:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished">Apellido:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished">Introducir la dirección de correo electrónico</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished">Extensiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished">Fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished">GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished">Purgar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished">Colas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished">Rebase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished">Transplantar</translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -30328,27 +30514,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> <source>Mercurial User Data</source> - <translation>Datos de Usuario de Mercurial</translation> + <translation type="obsolete">Datos de Usuario de Mercurial</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation>Nombre de &Usuario:</translation> + <translation type="obsolete">Nombre de &Usuario:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> <source>Enter the name of the user (first name and last name)</source> - <translation>Introducir el nombre de usuario (primer nombre y apellido)</translation> + <translation type="obsolete">Introducir el nombre de usuario (primer nombre y apellido)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation>&Correo electrónico:</translation> + <translation type="obsolete">&Correo electrónico:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> <source>Enter the email address</source> - <translation>Introducir la dirección de correo electrónico</translation> + <translation type="obsolete">Introducir la dirección de correo electrónico</translation> </message> </context> <context>
--- a/i18n/eric5_fr.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_fr.ts Sun Jan 26 15:49:14 2014 +0100 @@ -14218,12 +14218,12 @@ <context> <name>EricapiConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Sélectionner un fichier de sortie</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Sélection des répertoires à exclure</translation> </message> @@ -14328,7 +14328,7 @@ <translation>Liste des répertoires à ignorer</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>Fichiers API (*.api);;All files (*)</translation> </message> @@ -14520,22 +14520,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Sélection du répertoire de sortie</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Sélection des répertoires à exclure</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Feuille de style (*.css);;Tous les fichiers (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Sélection d'une feuille de style CSS</translation> </message> @@ -14840,7 +14840,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -20892,27 +20892,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -20922,87 +20922,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21012,72 +21012,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21107,7 +21107,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -21429,102 +21429,102 @@ <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation type="unfinished"></translation> </message> @@ -21534,17 +21534,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -21592,72 +21592,72 @@ <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -22578,122 +22578,122 @@ <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Message de commit</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -23568,82 +23568,82 @@ <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation type="unfinished">Cocher pour forcer l'opération de fusion</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation type="unfinished">Cocher pour forcer l'opération de fusion</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation type="unfinished">Forcer la fusion</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25867,132 +25867,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished">Numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -26026,6 +26026,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">Défaut</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished">Nom d'utilisateur:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Mot de passe:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -26053,57 +26121,57 @@ <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -26118,17 +26186,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -26146,102 +26214,102 @@ <translation type="unfinished">Révision &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Sélectionner pour spécifier une révision par son numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation type="unfinished">Numéro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation type="unfinished">Entrer un numéro de révision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation type="unfinished">Sélectionne la révision avant la dernière validation</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation type="unfinished">PREC</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation type="unfinished">Révision &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -27129,6 +27197,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -32763,29 +32949,9 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> - <source>&Username:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Email:</translation> </message> </context> <context>
--- a/i18n/eric5_it.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_it.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13517,12 +13517,12 @@ <context> <name>EricapiConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Seleziona un file di output</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Seleziona la directory da escludere</translation> </message> @@ -13617,7 +13617,7 @@ <translation>Lista di nomi base di directory da ignorare</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>File API (*.api);;Tutti i file (*)</translation> </message> @@ -13749,22 +13749,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Seleziona la directory di output</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Seleziona una directory da escludere</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Fogli di stile (*.css);;Tutti i file (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Seleziona un foglio di stile CSS</translation> </message> @@ -14074,7 +14074,7 @@ <translation>Genera i file QtHelp collection</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Seleziona la directory di destinazione per i file QtHelp</translation> </message> @@ -19795,27 +19795,27 @@ <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <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="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <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="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <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="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> @@ -19825,87 +19825,87 @@ <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <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="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19915,72 +19915,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20010,7 +20010,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20332,102 +20332,102 @@ <translation>Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Inserisci id del changeset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <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/HgBackoutDialog.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/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Inserisci il nome del tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <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/HgBackoutDialog.ui" line="120"/> - <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/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Inserisci un nome di branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <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/HgBackoutDialog.ui" line="178"/> - <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/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>Nessuna revisione selezionata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Commit dei dati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Messaggio di commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Inserisci il messaggio per la commit o lascia vuoto per usare quello di default</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Data della commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Inserisci formato data opzionale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Utente della commit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Inserisci utente per la commit opzionale</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Selezione per unire con il genitore della directory del progetto</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Selezione per unire con il genitore della directory del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Merge con il genitore correte</translation> </message> @@ -20437,17 +20437,17 @@ <translation>Ritiro changeset <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -20490,72 +20490,72 @@ <translation type="unfinished">Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished">Inserisci id del changeset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished">Inserisci il nome del tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <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/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <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/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished">Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished">Inserisci un nome di branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> @@ -21499,122 +21499,122 @@ <translation type="unfinished">Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished">Inserisci id del changeset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished">Inserisci il nome del tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <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/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <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/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished">Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished">Inserisci un nome di branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Messaggio di commit</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -22478,82 +22478,82 @@ <translation>Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Inserisci id del changeset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Inserisci il nome del tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Inserisci un nome di branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <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/HgMergeDialog.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/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Nessuna revisione selezionata</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Seleziona per forzare un'operazione di merge</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Seleziona per forzare un'operazione di merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Forza il merge</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -24853,132 +24853,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished">Numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished">Inserisci id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished">Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished">Inserisci il nome del tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished">Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished">Inserisci un nome di branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished">Seleziona la revisione tip del reposutory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25012,6 +25012,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -25039,57 +25107,57 @@ <translation>Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Inserisci id del changeset</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <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/HgRevisionSelectionDialog.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/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Inserisci il nome del tag</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <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/HgRevisionSelectionDialog.ui" line="120"/> - <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/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Inserisci un nome di branch</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Seleziona la revisione tip del reposutory</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Seleziona la revisione tip del reposutory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -25104,17 +25172,17 @@ <translation>Seleziona per non indicare una specifica revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25132,102 +25200,102 @@ <translation>Revisione &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation>Seleziona per specificare una revisione con un numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Numero</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Inserisci un numero di revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation>Seleziona per specificare la revisione dall'id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Inserisci id del changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <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/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Tag:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Inserisci il nome del tag</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <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/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Branch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Inserisci un nome di branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation>Seleziona la revisione tip del reposutory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Seleziona la revisione prima dell'ultima commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Revisione &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -26132,6 +26200,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Segnalibri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -31611,29 +31797,14 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation type="unfinished">Nome &Utente:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Nome &Utente:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Email:</translation> </message> </context> <context>
--- a/i18n/eric5_ru.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_ru.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13606,12 +13606,12 @@ <context> <name>EricapiConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Выберите целевой файл</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Выберите исключаемый каталог</translation> </message> @@ -13706,7 +13706,7 @@ <translation>Список игнорируемых базовых имён каталогов</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>Файлы API (*.api);;Все файлы (*)</translation> </message> @@ -13857,22 +13857,22 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Выберите целевой каталог</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Выберите исключаемый каталог</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Стили CSS (*.css);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Выберите стиль CSS</translation> </message> @@ -14172,7 +14172,7 @@ <translation>Введите краткий заголовок для точки входа</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Введите имя каталога назначения для файлов Qt Помощи</translation> </message> @@ -19935,27 +19935,27 @@ <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> @@ -19965,87 +19965,87 @@ <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20055,72 +20055,72 @@ <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20150,7 +20150,7 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20472,102 +20472,102 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation>Не задавать конкретную ревизию</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>Ревизия не выбрана</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Фиксировать данные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Описание изменений:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Введите описание изменений, иначе будет использовано описание по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Дата подачи:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Введите дату подачи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Автор подачи:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Введите автора подачи</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Слить с предком проекта</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Слить с предком проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Слить с текущим предком</translation> </message> @@ -20577,17 +20577,17 @@ <translation>Отмена изменений <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> @@ -20635,72 +20635,72 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation>Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation>Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -21634,122 +21634,122 @@ <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished">Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished">Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished">Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished">Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished">Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished">Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Commit сообщение</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -22619,82 +22619,82 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation>Не задавать конкретную ревизию</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Ревизия не выбрана</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Выполнить операцию слияния принудительно</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Выполнить операцию слияния принудительно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Слить принудительно</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation>Введите имя закладки</translation> </message> @@ -24998,132 +24998,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished">Задайте идентификатор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Задать ревизию с помощью метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished">Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished">Введите имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished">Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished">Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished">Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished">TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25157,6 +25157,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">По умолчанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished">Имя пользователя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Пароль:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="29"/> @@ -25174,42 +25242,42 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -25224,17 +25292,17 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> <source>Select to specify a revision by a branch</source> <translation>Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> @@ -25249,17 +25317,17 @@ <translation>Не задавать конкретную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> @@ -25277,102 +25345,102 @@ <translation>Ревизия &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation>Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation>Задать ревизию с помощью метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation>Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation>Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Выбрать ревизию перед последней подачей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Ревизия &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> @@ -26287,6 +26355,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished">Название фильтра:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished">Фамилия:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished">Запрос</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished">GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -31770,29 +31956,14 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation type="unfinished">&Имя пользователя:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Имя пользователя:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Email:</translation> </message> </context> <context>
--- a/i18n/eric5_tr.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_tr.ts Sun Jan 26 15:49:14 2014 +0100 @@ -13676,17 +13676,17 @@ <translation>yoksayılacak anadosyaların dizin listesi</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Çıktı dosyasının seçiniz</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>API dosyaları (*.api);;Tüm dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Dışırıda tutulacak dizinleri seçiniz</translation> </message> @@ -14107,27 +14107,27 @@ <translation type="obsolete"><?xml sürüm="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>%%(Başlık)lar</title></head><body stil="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 stil="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Seviye 1 Başlık</h1><h3 stil="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Seviye 2 Başlık </h3><h2 stil="background-color:%(CFBgColor)s;color:%(CFColor)s">Sınıf ve Fonksiyon Başlığı</h2>Standart gövde metni <a stil="color:%(LinkColor)s">Bazı bağlantılar</a> gömülüdür.</body></html></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Çıktı dizinini seç</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Dışırıda tutulacak dizinleri seçiniz</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>CSS sayfa stilini seç</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Sayfa stili (*.css);;Tüm dosyalar (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>QtHelp dosyalarının çıktı dizinini seçiniz</translation> </message> @@ -19866,112 +19866,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <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="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19981,72 +19981,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20076,7 +20076,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20398,102 +20398,102 @@ <translation>Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Değişiklik set kimliğini gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Etiket adı gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Bir branş adı giriniz</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation>Seçilmiş gözden geçirme yok</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Teslim edilece veri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Teslimat mesajı:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Teslimat Tarihi:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Teslimat kullanıcısı (alıcı):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation type="unfinished"></translation> </message> @@ -20503,17 +20503,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -20561,72 +20561,72 @@ <translation type="unfinished">Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished">Değişiklik set kimliğini gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished">Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished">Etiket adı gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished">Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished">Bir branş adı giriniz</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -21562,122 +21562,122 @@ <translation type="unfinished">Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished">Değişiklik set kimliğini gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished">Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished">Etiket adı gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished">Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished">Bir branş adı giriniz</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Teslimat mesajı</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -22537,82 +22537,82 @@ <translation>Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Değişiklik set kimliğini gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Etiket adı gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Bir branş adı giriniz</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Seçilmiş gözden geçirme yok</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Birleştirme işlemine zorlamak için seçiniz</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Birleştirme işlemine zorlamak için seçiniz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Birleştirmeye zorla</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -24816,132 +24816,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished">Numara</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished">Değişiklik set kimliğini gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished">Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished">Etiket adı gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished">Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished">Bir branş adı giriniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -24975,6 +24975,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">Varsayılan</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished">Kullanıcı Adı:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Parola:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -25002,57 +25070,57 @@ <translation>Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Değişiklik set kimliğini gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Etiket adı gir</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation>Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Bir branş adı giriniz</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -25067,17 +25135,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25095,102 +25163,102 @@ <translation>Gözden Geçirme &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation>Gözden geçirme numarasının açıkça belirtmeyi seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation>Numara</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation>Gözden geçirme numarası gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation>Değişiklik set kimliğini gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation>Etiket:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation>Etiket adı gir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation>Sınıf(Branş):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation>Bir branş adı giriniz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation>Son teslimattan önce gözden geçirmeyi seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation>Gözden Geçirme &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -26099,6 +26167,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Yerimleri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -31585,29 +31771,14 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation type="unfinished">K&ullanıcı Adı:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">K&ullanıcı Adı:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&E-Posta:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&E-Posta:</translation> </message> </context> <context>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jan 25 18:10:09 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sun Jan 26 15:49:14 2014 +0100 @@ -14268,17 +14268,17 @@ <translation>要忽略的文件夹基本名称列表</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>选择输出文件</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="187"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>API files (*.api);;All files (*)</source> <translation>API 文件 (*.api);;所有文件 (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="218"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>选择要排除的文件夹</translation> </message> @@ -14671,22 +14671,22 @@ <translation type="obsolete"><?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>%%(Title)s</title></head><body style="background-color:%(BodyBgColor)s;color:%(BodyColor)s"><h1 style="background-color:%(Level1HeaderBgColor)s;color:%(Level1HeaderColor)s">Level 1 Header</h1><h3 style="background-color:%(Level2HeaderBgColor)s;color:%(Level2HeaderColor)s">Level 2 Header</h3><h2 style="background-color:%(CFBgColor)s;color:%(CFColor)s">Class and Function Header</h2>Standard body text with <a style="color:%(LinkColor)s">some links</a> embedded.</body></html></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="296"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>选择输出文件夹</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="321"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>选择要排除的文件夹</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>选择 CSS 样式表</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="361"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>样式表 (*.css);;所有文件 (*)</translation> </message> @@ -14751,7 +14751,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="510"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation type="unfinished"></translation> </message> @@ -20809,27 +20809,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2276"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2327"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -20839,87 +20839,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2511"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2623"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2641"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2413"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2713"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2467"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2579"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2774"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> <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="2772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2794"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20929,72 +20929,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> <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="3359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2918"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3047"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3186"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21024,7 +21024,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -21346,102 +21346,102 @@ <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation type="unfinished"></translation> </message> @@ -21451,17 +21451,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -21509,72 +21509,72 @@ <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -22495,122 +22495,122 @@ <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">提交消息</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> @@ -23485,82 +23485,82 @@ <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation type="unfinished">选择强制进行合并操作</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation type="unfinished">选择强制进行合并操作</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation type="unfinished">强制合并</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -25789,132 +25789,132 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">选择通过号码指定一个修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished">号码</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> @@ -25948,6 +25948,74 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">默认</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished">用户名：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">密码：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the passowrd to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the passowrd to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> @@ -25975,57 +26043,57 @@ <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation type="unfinished"></translation> </message> @@ -26040,17 +26108,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -26068,102 +26136,102 @@ <translation type="unfinished">修订 &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="201"/> <source>Select to specify a revision by number</source> <translation type="unfinished">选择通过号码指定一个修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> <source>Number</source> <translation type="unfinished">号码</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="214"/> <source>Enter a revision number</source> <translation type="unfinished">输入一个修订号</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="243"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="253"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> <source>Enter a branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="335"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="338"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="348"/> <source>Select revision before last commit</source> <translation type="unfinished">选择在最后提交之前修订</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="351"/> <source>PREV</source> <translation type="unfinished">以前的</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="195"/> <source>Revision &2</source> <translation type="unfinished">修订 &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="306"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="309"/> <source>Bookmark:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="325"/> <source>Enter a bookmark name</source> <translation type="unfinished"></translation> </message> @@ -27046,6 +27114,124 @@ </message> </context> <context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">书签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the rebas extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="../Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -32678,29 +32864,9 @@ <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> - <source>&Username:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">电子邮件(&E)：</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">电子邮件(&E)：</translation> </message> </context> <context>
