Tue, 23 Aug 2016 12:21:46 +0200
Removed the support for the obsolete transplant Mercuril extension and made v3.0 the minimum Mercurial version.
--- a/APIs/Python3/eric6.api Thu Aug 18 17:34:05 2016 +0200 +++ b/APIs/Python3/eric6.api Tue Aug 23 12:21:46 2016 +0200 @@ -5497,21 +5497,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgUnshelveContinue?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.shutdown?4() eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve?1(vcs) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initActions?4() -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.initMenu?4(mainMenu) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.menuTitle?4() -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper.setObjects?4(vcsObject, projectObject) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.TransplantProjectHelper?1() -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.RevisionsValidator.validate?4(input, pos) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.RevisionsValidator?1(multiRevsAllowed, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.getData?4() -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_allCheckBox_clicked?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_branchesCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog.on_revisionsEdit_textChanged?4() -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.TransplantDialog?1(branchesList, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplant?4(path) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplantContinue?4(path) -eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant?1(vcs) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.IgnoreFileName?7 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.activeExtensionsChanged?7
--- a/APIs/Python3/eric6.bas Thu Aug 18 17:34:05 2016 +0200 +++ b/APIs/Python3/eric6.bas Tue Aug 23 12:21:46 2016 +0200 @@ -651,7 +651,6 @@ RecursionError OverflowError ValueError Redirector QObject RemoveBookmarksCommand QUndoCommand -RevisionsValidator QValidator SafariImporter BookmarksImporter SchemeAccessHandler QObject SearchReplaceSlidingWidget QWidget @@ -782,9 +781,6 @@ ToolGroupConfigurationDialog QDialog Ui_ToolGroupConfigurationDialog TranslationPropertiesDialog QDialog Ui_TranslationPropertiesDialog TranslationsDict QObject -Transplant HgExtension -TransplantDialog QDialog Ui_TransplantDialog -TransplantProjectHelper HgExtensionProjectHelper TrayStarter QSystemTrayIcon TrayStarterPage ConfigurationPageBase Ui_TrayStarterPage UIPreviewer E5MainWindow
--- a/Documentation/Help/source.qhp Thu Aug 18 17:34:05 2016 +0200 +++ b/Documentation/Help/source.qhp Tue Aug 23 12:21:46 2016 +0200 @@ -580,11 +580,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html" /> </section> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html"> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html" /> - </section> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.Config" ref="eric6.Plugins.VcsPlugins.vcsMercurial.Config.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html" /> @@ -11124,7 +11119,6 @@ <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric6.VCS.ProjectHelper.html" /> @@ -11935,9 +11929,6 @@ <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RepositoryInfoDialog (Module)" id="RepositoryInfoDialog (Module)" ref="eric6.VCS.RepositoryInfoDialog.html" /> - <keyword name="RevisionsValidator" id="RevisionsValidator" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#RevisionsValidator" /> - <keyword name="RevisionsValidator (Constructor)" id="RevisionsValidator (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#RevisionsValidator.__init__" /> - <keyword name="RevisionsValidator.validate" id="RevisionsValidator.validate" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#RevisionsValidator.validate" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter (Constructor)" id="SafariImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter.__init__" /> @@ -14138,27 +14129,6 @@ <keyword name="TranslationsDict.loadTransFile" id="TranslationsDict.loadTransFile" ref="eric6.Tools.TRPreviewer.html#TranslationsDict.loadTransFile" /> <keyword name="TranslationsDict.reload" id="TranslationsDict.reload" ref="eric6.Tools.TRPreviewer.html#TranslationsDict.reload" /> <keyword name="TranslationsDict.set" id="TranslationsDict.set" ref="eric6.Tools.TRPreviewer.html#TranslationsDict.set" /> - <keyword name="Transplant" id="Transplant" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html#Transplant" /> - <keyword name="Transplant (Constructor)" id="Transplant (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html#Transplant.__init__" /> - <keyword name="Transplant.hgTransplant" id="Transplant.hgTransplant" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html#Transplant.hgTransplant" /> - <keyword name="Transplant.hgTransplantContinue" id="Transplant.hgTransplantContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html#Transplant.hgTransplantContinue" /> - <keyword name="TransplantDialog" id="TransplantDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog" /> - <keyword name="TransplantDialog (Constructor)" id="TransplantDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.__init__" /> - <keyword name="TransplantDialog (Module)" id="TransplantDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html" /> - <keyword name="TransplantDialog.__updateOk" id="TransplantDialog.__updateOk" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.__updateOk" /> - <keyword name="TransplantDialog.getData" id="TransplantDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.getData" /> - <keyword name="TransplantDialog.on_allCheckBox_clicked" id="TransplantDialog.on_allCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.on_allCheckBox_clicked" /> - <keyword name="TransplantDialog.on_branchesCombo_editTextChanged" id="TransplantDialog.on_branchesCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.on_branchesCombo_editTextChanged" /> - <keyword name="TransplantDialog.on_revisionsEdit_textChanged" id="TransplantDialog.on_revisionsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html#TransplantDialog.on_revisionsEdit_textChanged" /> - <keyword name="TransplantExtension (Package)" id="TransplantExtension (Package)" ref="index-eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html" /> - <keyword name="TransplantProjectHelper" id="TransplantProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper" /> - <keyword name="TransplantProjectHelper (Constructor)" id="TransplantProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.__init__" /> - <keyword name="TransplantProjectHelper.__hgTransplant" id="TransplantProjectHelper.__hgTransplant" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.__hgTransplant" /> - <keyword name="TransplantProjectHelper.__hgTransplantContinue" id="TransplantProjectHelper.__hgTransplantContinue" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.__hgTransplantContinue" /> - <keyword name="TransplantProjectHelper.initActions" id="TransplantProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.initActions" /> - <keyword name="TransplantProjectHelper.initMenu" id="TransplantProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.initMenu" /> - <keyword name="TransplantProjectHelper.menuTitle" id="TransplantProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.menuTitle" /> - <keyword name="TransplantProjectHelper.setObjects" id="TransplantProjectHelper.setObjects" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html#TransplantProjectHelper.setObjects" /> <keyword name="TrayStarter" id="TrayStarter" ref="eric6.Tools.TrayStarter.html#TrayStarter" /> <keyword name="TrayStarter (Constructor)" id="TrayStarter (Constructor)" ref="eric6.Tools.TrayStarter.html#TrayStarter.__init__" /> <keyword name="TrayStarter (Module)" id="TrayStarter (Module)" ref="eric6.Tools.TrayStarter.html" /> @@ -16736,7 +16706,6 @@ <keyword name="trailing_whitespace" id="trailing_whitespace" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#trailing_whitespace" /> <keyword name="translate" id="translate" ref="eric6.Globals.__init__.html#translate" /> <keyword name="translations (Module)" id="translations (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations.html" /> - <keyword name="transplant (Module)" id="transplant (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html" /> <keyword name="uiStartUp" id="uiStartUp" ref="eric6.eric6.html#uiStartUp" /> <keyword name="uic (Module)" id="uic (Module)" ref="eric6.Utilities.uic.html" /> <keyword name="unescape_uentities" id="unescape_uentities" ref="eric6.Utilities.__init__.html#unescape_uentities" /> @@ -17287,9 +17256,6 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.hg.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.Config.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.html</file> @@ -17889,7 +17855,6 @@ <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html</file> - <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsMercurial.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.html</file> <file>index-eric6.Plugins.VcsPlugins.vcsPySvn.html</file>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper</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>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper</h1> -<p> -Module implementing the transplant extension project helper. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#TransplantProjectHelper">TransplantProjectHelper</a></td> -<td>Class implementing the transplant extension project helper.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="TransplantProjectHelper" ID="TransplantProjectHelper"></a> -<h2>TransplantProjectHelper</h2> -<p> - Class implementing the transplant extension project helper. -</p> -<h3>Derived from</h3> -HgExtensionProjectHelper -<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="#TransplantProjectHelper.__init__">TransplantProjectHelper</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.__hgTransplant">__hgTransplant</a></td> -<td>Private slot used to transplant changesets from another branch.</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.__hgTransplantContinue">__hgTransplantContinue</a></td> -<td>Private slot used to continue the last transplant session after repair.</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr><tr> -<td><a href="#TransplantProjectHelper.setObjects">setObjects</a></td> -<td>Public method to set references to the vcs and project objects.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="TransplantProjectHelper.__init__" ID="TransplantProjectHelper.__init__"></a> -<h4>TransplantProjectHelper (Constructor)</h4> -<b>TransplantProjectHelper</b>(<i></i>) -<p> - Constructor -</p><a NAME="TransplantProjectHelper.__hgTransplant" ID="TransplantProjectHelper.__hgTransplant"></a> -<h4>TransplantProjectHelper.__hgTransplant</h4> -<b>__hgTransplant</b>(<i></i>) -<p> - Private slot used to transplant changesets from another branch. -</p><a NAME="TransplantProjectHelper.__hgTransplantContinue" ID="TransplantProjectHelper.__hgTransplantContinue"></a> -<h4>TransplantProjectHelper.__hgTransplantContinue</h4> -<b>__hgTransplantContinue</b>(<i></i>) -<p> - Private slot used to continue the last transplant session after repair. -</p><a NAME="TransplantProjectHelper.initActions" ID="TransplantProjectHelper.initActions"></a> -<h4>TransplantProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) -<p> - Public method to generate the action objects. -</p><a NAME="TransplantProjectHelper.initMenu" ID="TransplantProjectHelper.initMenu"></a> -<h4>TransplantProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) -<p> - Public method to generate the extension menu. -</p><dl> -<dt><i>mainMenu</i></dt> -<dd> -reference to the main menu (QMenu) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -populated menu (QMenu) -</dd> -</dl><a NAME="TransplantProjectHelper.menuTitle" ID="TransplantProjectHelper.menuTitle"></a> -<h4>TransplantProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p><dl> -<dt>Returns:</dt> -<dd> -title of the menu (string) -</dd> -</dl><a NAME="TransplantProjectHelper.setObjects" ID="TransplantProjectHelper.setObjects"></a> -<h4>TransplantProjectHelper.setObjects</h4> -<b>setObjects</b>(<i>vcsObject, projectObject</i>) -<p> - Public method to set references to the vcs and project objects. -</p><dl> -<dt><i>vcsObject</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>projectObject</i></dt> -<dd> -reference to the project object -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,211 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog</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>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog</h1> -<p> -Module implementing a dialog to enter the data for a transplant session. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#RevisionsValidator">RevisionsValidator</a></td> -<td>Class implementing a validator for the revisions line edit.</td> -</tr><tr> -<td><a href="#TransplantDialog">TransplantDialog</a></td> -<td>Class implementing a dialog to enter the data for a transplant session.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="RevisionsValidator" ID="RevisionsValidator"></a> -<h2>RevisionsValidator</h2> -<p> - Class implementing a validator for the revisions line edit. -</p> -<h3>Derived from</h3> -QValidator -<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="#RevisionsValidator.__init__">RevisionsValidator</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#RevisionsValidator.validate">validate</a></td> -<td>Public method to validate the given input.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="RevisionsValidator.__init__" ID="RevisionsValidator.__init__"></a> -<h4>RevisionsValidator (Constructor)</h4> -<b>RevisionsValidator</b>(<i>multiRevsAllowed, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>multiRevsAllowed</i></dt> -<dd> -flag indicating, if multi revs are allowed - (boolean) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent object (QObject) -</dd> -</dl><a NAME="RevisionsValidator.validate" ID="RevisionsValidator.validate"></a> -<h4>RevisionsValidator.validate</h4> -<b>validate</b>(<i>input, pos</i>) -<p> - Public method to validate the given input. -</p><dl> -<dt><i>input</i></dt> -<dd> -input to be validated (string) -</dd><dt><i>pos</i></dt> -<dd> -position of the cursor (integer) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -tuple with validation result, input and position - (QValidator.State, string, integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="TransplantDialog" ID="TransplantDialog"></a> -<h2>TransplantDialog</h2> -<p> - Class implementing a dialog to enter the data for a transplant session. -</p> -<h3>Derived from</h3> -QDialog, Ui_TransplantDialog -<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="#TransplantDialog.__init__">TransplantDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#TransplantDialog.__updateOk">__updateOk</a></td> -<td>Private slot to update the state of the OK button.</td> -</tr><tr> -<td><a href="#TransplantDialog.getData">getData</a></td> -<td>Public method to retrieve the entered data.</td> -</tr><tr> -<td><a href="#TransplantDialog.on_allCheckBox_clicked">on_allCheckBox_clicked</a></td> -<td>Private slot to react upon selection of the all check box.</td> -</tr><tr> -<td><a href="#TransplantDialog.on_branchesCombo_editTextChanged">on_branchesCombo_editTextChanged</a></td> -<td>Private slot to react upon changes of the branch name.</td> -</tr><tr> -<td><a href="#TransplantDialog.on_revisionsEdit_textChanged">on_revisionsEdit_textChanged</a></td> -<td>Private slot to react upon changes of revisions.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="TransplantDialog.__init__" ID="TransplantDialog.__init__"></a> -<h4>TransplantDialog (Constructor)</h4> -<b>TransplantDialog</b>(<i>branchesList, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>branchesList</i></dt> -<dd> -list of available branch names (list of strings) -</dd><dt><i>parent</i></dt> -<dd> -reference to the parent widget (QWidget) -</dd> -</dl><a NAME="TransplantDialog.__updateOk" ID="TransplantDialog.__updateOk"></a> -<h4>TransplantDialog.__updateOk</h4> -<b>__updateOk</b>(<i></i>) -<p> - Private slot to update the state of the OK button. -</p><a NAME="TransplantDialog.getData" ID="TransplantDialog.getData"></a> -<h4>TransplantDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to retrieve the entered data. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple with list of revisions, source repo, branch name, a flag - indicating to transplant all, list of revisions to skip, list of - revisions to merge and a flag indicating to append transplant info - (list of strings, string, string, boolean, list of strings, - list of strings, boolean) -</dd> -</dl><a NAME="TransplantDialog.on_allCheckBox_clicked" ID="TransplantDialog.on_allCheckBox_clicked"></a> -<h4>TransplantDialog.on_allCheckBox_clicked</h4> -<b>on_allCheckBox_clicked</b>(<i>checked</i>) -<p> - Private slot to react upon selection of the all check box. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the check box (boolean) -</dd> -</dl><a NAME="TransplantDialog.on_branchesCombo_editTextChanged" ID="TransplantDialog.on_branchesCombo_editTextChanged"></a> -<h4>TransplantDialog.on_branchesCombo_editTextChanged</h4> -<b>on_branchesCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to react upon changes of the branch name. -</p><dl> -<dt><i>txt</i></dt> -<dd> -contents of the branches combo (string) -</dd> -</dl><a NAME="TransplantDialog.on_revisionsEdit_textChanged" ID="TransplantDialog.on_revisionsEdit_textChanged"></a> -<h4>TransplantDialog.on_revisionsEdit_textChanged</h4> -<b>on_revisionsEdit_textChanged</b>(<i></i>) -<p> - Private slot to react upon changes of revisions. -</p> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant</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>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant</h1> -<p> -Module implementing the transplant extension interface. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#Transplant">Transplant</a></td> -<td>Class implementing the transplant extension interface.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="Transplant" ID="Transplant"></a> -<h2>Transplant</h2> -<p> - Class implementing the transplant extension interface. -</p> -<h3>Derived from</h3> -HgExtension -<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="#Transplant.__init__">Transplant</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#Transplant.hgTransplant">hgTransplant</a></td> -<td>Public method to transplant changesets from another branch.</td> -</tr><tr> -<td><a href="#Transplant.hgTransplantContinue">hgTransplantContinue</a></td> -<td>Public method to continue transplanting changesets from another branch.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="Transplant.__init__" ID="Transplant.__init__"></a> -<h4>Transplant (Constructor)</h4> -<b>Transplant</b>(<i>vcs</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the Mercurial vcs object -</dd> -</dl><a NAME="Transplant.hgTransplant" ID="Transplant.hgTransplant"></a> -<h4>Transplant.hgTransplant</h4> -<b>hgTransplant</b>(<i>path</i>) -<p> - Public method to transplant changesets from another branch. -</p><dl> -<dt><i>path</i></dt> -<dd> -directory name of the project (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -flag indicating that the project should be reread (boolean) -</dd> -</dl><a NAME="Transplant.hgTransplantContinue" ID="Transplant.hgTransplantContinue"></a> -<h4>Transplant.hgTransplantContinue</h4> -<b>hgTransplantContinue</b>(<i>path</i>) -<p> - Public method to continue transplanting changesets from another branch. -</p><dl> -<dt><i>path</i></dt> -<dd> -directory name of the project (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -flag indicating that the project should be reread (boolean) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension</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> -<h1>eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension</h1> -<p> -Package implementing the transplant extension support interface. -</p> - - -<h3>Modules</h3> -<table> -<tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the transplant extension project helper.</td> -</tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.TransplantDialog.html">TransplantDialog</a></td> -<td>Module implementing a dialog to enter the data for a transplant session.</td> -</tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.html">transplant</a></td> -<td>Module implementing the transplant extension interface.</td> -</tr> -</table> -</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Thu Aug 18 17:34:05 2016 +0200 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Tue Aug 23 12:21:46 2016 +0200 @@ -53,9 +53,6 @@ </tr><tr> <td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html">ShelveExtension</a></td> <td>Package implementing the shelve extension support interface.</td> -</tr><tr> -<td><a href="index-eric6.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.html">TransplantExtension</a></td> -<td>Package implementing the transplant extension support interface.</td> </tr> </table>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -45,9 +45,6 @@ self.amendCheckBox.setVisible(False) self.subrepoCheckBox.setVisible(False) else: - if vcs.version < (2, 2): - self.amendCheckBox.setEnabled(False) - self.subrepoCheckBox.setVisible(vcs.hasSubrepositories()) def showEvent(self, evt):
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -131,8 +131,8 @@ self.__hasAddOrDelete = False if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", - "transplant", "update", "import", "revert", - "graft", "shelve", "unshelve"] or \ + "update", "import", "revert", "graft", "shelve", + "unshelve"] or \ (args[0] in ["pull", "unbundle"] and ("--update" in args[1:] or "--rebase" in args[1:])): self.__updateCommand = True
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -33,11 +33,6 @@ self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) - if vcs.version < (2, 3): - self.logCheckBox.setEnabled(False) - self.logCheckBox.setChecked(False) - self.logCheckBox.setVisible(False) - if revs: self.revisionsEdit.setPlainText("\n".join(sorted(revs)))
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -171,8 +171,6 @@ self.BookmarksColumn = self.logTree.columnCount() self.logTree.headerItem().setText( self.BookmarksColumn, self.tr("Bookmarks")) - if self.vcs.version < (2, 1): - self.logTree.setColumnHidden(self.PhaseColumn, True) self.__initActionsMenu() @@ -181,25 +179,19 @@ Private method to initialize the actions menu. """ self.__actionsMenu = QMenu() - if self.vcs.version >= (2, 0): - self.__graftAct = self.__actionsMenu.addAction( - self.tr("Copy Changesets"), self.__graftActTriggered) - self.__graftAct.setToolTip(self.tr( - "Copy the selected changesets to the current branch")) - else: - self.__graftAct = None + self.__graftAct = self.__actionsMenu.addAction( + self.tr("Copy Changesets"), self.__graftActTriggered) + self.__graftAct.setToolTip(self.tr( + "Copy the selected changesets to the current branch")) - if self.vcs.version >= (2, 1): - self.__phaseAct = self.__actionsMenu.addAction( - self.tr("Change Phase"), self.__phaseActTriggered) - self.__phaseAct.setToolTip(self.tr( - "Change the phase of the selected revisions")) - self.__phaseAct.setWhatsThis(self.tr( - """<b>Change Phase</b>\n<p>This changes the phase of the""" - """ selected revisions. The selected revisions have to have""" - """ the same current phase.</p>""")) - else: - self.__phaseAct = None + self.__phaseAct = self.__actionsMenu.addAction( + self.tr("Change Phase"), self.__phaseActTriggered) + self.__phaseAct.setToolTip(self.tr( + "Change the phase of the selected revisions")) + self.__phaseAct.setWhatsThis(self.tr( + """<b>Change Phase</b>\n<p>This changes the phase of the""" + """ selected revisions. The selected revisions have to have""" + """ the same current phase.</p>""")) self.__tagAct = self.__actionsMenu.addAction( self.tr("Tag"), self.__tagActTriggered) @@ -216,13 +208,10 @@ self.tr("Pull Changes"), self.__pullActTriggered) self.__pullAct.setToolTip(self.tr( "Pull changes from a remote repository")) - if self.vcs.version >= (2, 0): - self.__lfPullAct = self.__actionsMenu.addAction( - self.tr("Pull Large Files"), self.__lfPullActTriggered) - self.__lfPullAct.setToolTip(self.tr( - "Pull large files for selected revisions")) - else: - self.__lfPullAct = None + self.__lfPullAct = self.__actionsMenu.addAction( + self.tr("Pull Large Files"), self.__lfPullActTriggered) + self.__lfPullAct.setToolTip(self.tr( + "Pull large files for selected revisions")) self.__actionsMenu.addSeparator() @@ -791,21 +780,10 @@ args.append('--follow') if self.commandMode == "log": args.append('--copies') - if self.vcs.version >= (3, 0): - args.append('--template') - args.append(os.path.join(os.path.dirname(__file__), - "templates", - "logBrowserBookmarkPhase.tmpl")) - else: - args.append('--style') - if self.vcs.version >= (2, 1): - args.append(os.path.join(os.path.dirname(__file__), - "styles", - "logBrowserBookmarkPhase.style")) - else: - args.append(os.path.join(os.path.dirname(__file__), - "styles", - "logBrowserBookmark.style")) + args.append('--template') + args.append(os.path.join(os.path.dirname(__file__), + "templates", + "logBrowserBookmarkPhase.tmpl")) if self.commandMode == "incoming": if self.__bundle: args.append(self.__bundle)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -141,21 +141,10 @@ args.append("--subrepos") if self.mode == "log": args.append('--copies') - if self.vcs.version >= (3, 0): - args.append('--template') - args.append(os.path.join(os.path.dirname(__file__), - "templates", - "logDialogBookmarkPhase.tmpl")) - else: - args.append('--style') - if self.vcs.version >= (2, 1): - args.append(os.path.join(os.path.dirname(__file__), - "styles", - "logDialogBookmarkPhase.style")) - else: - args.append(os.path.join(os.path.dirname(__file__), - "styles", - "logDialogBookmark.style")) + args.append('--template') + args.append(os.path.join(os.path.dirname(__file__), + "templates", + "logDialogBookmarkPhase.tmpl")) if self.mode == "incoming": if self.bundle: args.append(self.bundle)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -118,13 +118,12 @@ self.__addAct = self.menu.addAction( self.tr("Add to repository"), self.__add) self.menuactions.append(self.__addAct) - if self.vcs.version >= (2, 0): - self.lfActions.append(self.menu.addAction( - self.tr("Add as Large File"), - lambda: self.__lfAdd("large"))) - self.lfActions.append(self.menu.addAction( - self.tr("Add as Normal File"), - lambda: self.__lfAdd("normal"))) + self.lfActions.append(self.menu.addAction( + self.tr("Add as Large File"), + lambda: self.__lfAdd("large"))) + self.lfActions.append(self.menu.addAction( + self.tr("Add as Normal File"), + lambda: self.__lfAdd("normal"))) self.menu.addSeparator() self.__diffAct = self.menu.addAction( self.tr("Show differences"), self.__diff) @@ -154,7 +153,7 @@ self.statusList.customContextMenuRequested.connect( self.__showContextMenu) - if not mq and self.vcs.version >= (2, 0): + if not mq: self.__lfAddActions = [] self.__addButtonMenu = QMenu() self.__addButtonMenu.addAction(self.tr("Add"), self.__add)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Tue Aug 23 12:21:46 2016 +0200 @@ -60,16 +60,11 @@ self.shouldUpdate = False if self.__client is None and not self.__useCommandLine: - if self.vcs.version >= (2, 9, 9): - # versions below that have a bug causing a second - # instance to not recognize changes to the status - from .HgClient import HgClient - client = HgClient(self.projectDir, "utf-8", self.vcs) - ok, err = client.startServer() - if ok: - self.__client = client - else: - self.__useCommandLine = True + from .HgClient import HgClient + client = HgClient(self.projectDir, "utf-8", self.vcs) + ok, err = client.startServer() + if ok: + self.__client = client else: self.__useCommandLine = True
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Tue Aug 23 12:21:46 2016 +0200 @@ -28,9 +28,6 @@ super(HgUserConfigDataDialog, self).__init__(parent) self.setupUi(self) - if version >= (2, 3): - self.transplantCheckBox.setEnabled(False) - msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) @@ -58,8 +55,6 @@ extensions.append("rebase") if self.shelveCheckBox.isChecked(): extensions.append("shelve") - if self.transplantCheckBox.isChecked(): - extensions.append("transplant") if self.largefilesCheckBox.isChecked(): extensions.append("largefiles") largefilesDataDict = {}
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui Tue Aug 23 12:21:46 2016 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>455</height> + <height>468</height> </rect> </property> <property name="windowTitle"> @@ -144,16 +144,6 @@ </property> </widget> </item> - <item row="3" column="1"> - <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> @@ -252,7 +242,6 @@ <tabstop>queuesCheckBox</tabstop> <tabstop>rebaseCheckBox</tabstop> <tabstop>shelveCheckBox</tabstop> - <tabstop>transplantCheckBox</tabstop> <tabstop>lfFileSizeSpinBox</tabstop> <tabstop>lfFilePatternsEdit</tabstop> <tabstop>buttonBox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Aug 23 12:21:46 2016 +0200 @@ -44,7 +44,6 @@ from .FetchExtension.ProjectHelper import FetchProjectHelper from .PurgeExtension.ProjectHelper import PurgeProjectHelper from .GpgExtension.ProjectHelper import GpgProjectHelper - from .TransplantExtension.ProjectHelper import TransplantProjectHelper from .RebaseExtension.ProjectHelper import RebaseProjectHelper from .ShelveExtension.ProjectHelper import ShelveProjectHelper from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper @@ -53,7 +52,6 @@ "fetch": FetchProjectHelper(), "purge": PurgeProjectHelper(), "gpg": GpgProjectHelper(), - "transplant": TransplantProjectHelper(), "rebase": RebaseProjectHelper(), "shelve": ShelveProjectHelper(), "largefiles": LargefilesProjectHelper(), @@ -1363,14 +1361,11 @@ self.__extensionsMenu)) self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) - if self.vcs.version >= (2, 0): - graftMenu = QMenu(self.tr("Graft"), menu) - graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) - graftMenu.setTearOffEnabled(True) - graftMenu.addAction(self.hgGraftAct) - graftMenu.addAction(self.hgGraftContinueAct) - else: - graftMenu = None + graftMenu = QMenu(self.tr("Graft"), menu) + graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) + graftMenu.setTearOffEnabled(True) + graftMenu.addAction(self.hgGraftAct) + graftMenu.addAction(self.hgGraftContinueAct) subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) subrepoMenu.setTearOffEnabled(True) @@ -1387,9 +1382,8 @@ changesMenu.addAction(self.hgUnresolveAct) changesMenu.addAction(self.hgReMergeAct) changesMenu.addAction(self.hgCancelMergeAct) - if self.vcs.version >= (2, 1): - changesMenu.addSeparator() - changesMenu.addAction(self.hgPhaseAct) + changesMenu.addSeparator() + changesMenu.addAction(self.hgPhaseAct) act = menu.addAction( UI.PixmapCache.getIcon(
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the transplant extension project helper. -""" - -from __future__ import unicode_literals - -from PyQt5.QtWidgets import QMenu - -from E5Gui.E5Action import E5Action -from E5Gui import E5MessageBox - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - -import UI.PixmapCache - - -class TransplantProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the transplant extension project helper. - """ - def __init__(self): - """ - Constructor - """ - super(TransplantProjectHelper, self).__init__() - - def setObjects(self, vcsObject, projectObject): - """ - Public method to set references to the vcs and project objects. - - @param vcsObject reference to the vcs object - @param projectObject reference to the project object - """ - super(TransplantProjectHelper, self).setObjects( - vcsObject, projectObject) - - if self.vcs.version >= (2, 3): - # transplant is deprecated as of Mercurial 2.3 - for act in self.actions: - act.setEnabled(False) - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgTransplantAct = E5Action( - self.tr('Transplant Changesets'), - UI.PixmapCache.getIcon("vcsTransplant.png"), - self.tr('Transplant Changesets'), - 0, 0, self, 'mercurial_transplant') - self.hgTransplantAct.setStatusTip(self.tr( - 'Transplant changesets from another branch' - )) - self.hgTransplantAct.setWhatsThis(self.tr( - """<b>Transplant Changesets</b>""" - """<p>This transplants changesets from another branch on top""" - """ of the current working directory with the log of the""" - """ original changeset.</p>""" - )) - self.hgTransplantAct.triggered.connect(self.__hgTransplant) - self.actions.append(self.hgTransplantAct) - - self.hgTransplantContinueAct = E5Action( - self.tr('Continue Transplant Session'), - self.tr('Continue Transplant Session'), - 0, 0, self, 'mercurial_transplant_continue') - self.hgTransplantContinueAct.setStatusTip(self.tr( - 'Continue the last transplant session after repair' - )) - self.hgTransplantContinueAct.setWhatsThis(self.tr( - """<b>Continue Transplant Session</b>""" - """<p>This continues the last transplant session after""" - """ repair.</p>""" - )) - self.hgTransplantContinueAct.triggered.connect( - self.__hgTransplantContinue) - self.actions.append(self.hgTransplantContinueAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu (QMenu) - @return populated menu (QMenu) - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) - if self.vcs.version >= (2, 3): - # transplant is deprecated as of Mercurial 2.3 - menu.addAction( - self.tr("Transplant is deprecated")).setEnabled(False) - else: - menu.setTearOffEnabled(True) - - menu.addAction(self.hgTransplantAct) - menu.addAction(self.hgTransplantContinueAct) - - return menu - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu (string) - """ - return self.tr("Transplant") - - def __hgTransplant(self): - """ - Private slot used to transplant changesets from another branch. - """ - shouldReopen = self.vcs.getExtensionObject("transplant")\ - .hgTransplant(self.project.getProjectPath()) - if shouldReopen: - res = E5MessageBox.yesNo( - None, - self.tr("Transplant Changesets"), - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True) - if res: - self.project.reopenProject() - - def __hgTransplantContinue(self): - """ - Private slot used to continue the last transplant session after repair. - """ - shouldReopen = self.vcs.getExtensionObject("transplant")\ - .hgTransplantContinue(self.project.getProjectPath()) - if shouldReopen: - res = E5MessageBox.yesNo( - None, - self.tr("Transplant Changesets (Continue)"), - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True) - if res: - self.project.reopenProject()
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter the data for a transplant session. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtGui import QValidator -from PyQt5.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_TransplantDialog import Ui_TransplantDialog - - -class RevisionsValidator(QValidator): - """ - Class implementing a validator for the revisions line edit. - """ - def __init__(self, multiRevsAllowed, parent=None): - """ - Constructor - - @param multiRevsAllowed flag indicating, if multi revs are allowed - (boolean) - @param parent reference to the parent object (QObject) - """ - super(RevisionsValidator, self).__init__(parent) - - self.__multiRevsAllowed = multiRevsAllowed - - def validate(self, input, pos): - """ - Public method to validate the given input. - - @param input input to be validated (string) - @param pos position of the cursor (integer) - @return tuple with validation result, input and position - (QValidator.State, string, integer) - """ - state = QValidator.Invalid - - if input == "": - state = QValidator.Intermediate - else: - state = QValidator.Acceptable - revs = input.strip().split() - for rev in revs: - if ":" in rev: - if self.__multiRevsAllowed: - # it is a revision range - revList = rev.split(":") - if len(revList) != 2: - state = QValidator.Invalid - break - for r in revList: - if r != "" and not r.isdigit(): - state = QValidator.Invalid - break - else: - state = QValidator.Invalid - break - else: - if not rev.isdigit(): - state = QValidator.Invalid - break - - return state, input, pos - - -class TransplantDialog(QDialog, Ui_TransplantDialog): - """ - Class implementing a dialog to enter the data for a transplant session. - """ - def __init__(self, branchesList, parent=None): - """ - Constructor - - @param branchesList list of available branch names (list of strings) - @param parent reference to the parent widget (QWidget) - """ - super(TransplantDialog, self).__init__(parent) - self.setupUi(self) - - self.branchesCombo.addItems(["", "default"] + sorted(branchesList)) - - self.__mergeRevisionsValidator = RevisionsValidator(False, self) - self.mergeEdit.setValidator(self.__mergeRevisionsValidator) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - def __updateOk(self): - """ - Private slot to update the state of the OK button. - """ - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( - self.revisionsEdit.toPlainText() != "" or - self.allCheckBox.isChecked()) - - @pyqtSlot() - def on_revisionsEdit_textChanged(self): - """ - Private slot to react upon changes of revisions. - """ - self.__updateOk() - - @pyqtSlot(str) - def on_branchesCombo_editTextChanged(self, txt): - """ - Private slot to react upon changes of the branch name. - - @param txt contents of the branches combo (string) - """ - self.allCheckBox.setEnabled(txt != "") - - @pyqtSlot(bool) - def on_allCheckBox_clicked(self, checked): - """ - Private slot to react upon selection of the all check box. - - @param checked state of the check box (boolean) - """ - self.__updateOk() - - def getData(self): - """ - Public method to retrieve the entered data. - - @return tuple with list of revisions, source repo, branch name, a flag - indicating to transplant all, list of revisions to skip, list of - revisions to merge and a flag indicating to append transplant info - (list of strings, string, string, boolean, list of strings, - list of strings, boolean) - """ - return ( - self.revisionsEdit.toPlainText().strip().splitlines(), - self.repoEdit.text().strip(), - self.branchesCombo.currentText().strip(), - self.allCheckBox.isChecked(), - self.pruneEdit.toPlainText().strip().splitlines(), - self.mergeEdit.text().strip().split(), - self.logCheckBox.isChecked() - )
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,209 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>TransplantDialog</class> - <widget class="QDialog" name="TransplantDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>450</width> - <height>382</height> - </rect> - </property> - <property name="windowTitle"> - <string>Transplant Changesets</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>&Revisions:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="buddy"> - <cstring>revisionsEdit</cstring> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPlainTextEdit" name="revisionsEdit"> - <property name="toolTip"> - <string>Enter changesets by number, id, range or revset expression one per line</string> - </property> - <property name="tabChangesFocus"> - <bool>true</bool> - </property> - <property name="lineWrapMode"> - <enum>QPlainTextEdit::NoWrap</enum> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Repositor&y:</string> - </property> - <property name="buddy"> - <cstring>repoEdit</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="repoEdit"> - <property name="toolTip"> - <string>Enter a repository URL, if changesets shall be transplanted from a repository</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>&Branch:</string> - </property> - <property name="buddy"> - <cstring>branchesCombo</cstring> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QComboBox" name="branchesCombo"> - <property name="toolTip"> - <string>Select or enter the branch to transplant from</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="allCheckBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Select to transplant all changesets of the branch</string> - </property> - <property name="text"> - <string>Transplant &All Changesets</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>&Skip:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="buddy"> - <cstring>pruneEdit</cstring> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QPlainTextEdit" name="pruneEdit"> - <property name="toolTip"> - <string>Enter changesets by number, id, range or revset expression one per line</string> - </property> - <property name="tabChangesFocus"> - <bool>true</bool> - </property> - <property name="lineWrapMode"> - <enum>QPlainTextEdit::NoWrap</enum> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>&Merge:</string> - </property> - <property name="buddy"> - <cstring>mergeEdit</cstring> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLineEdit" name="mergeEdit"> - <property name="toolTip"> - <string>Enter revisions to be merged separated by a space character</string> - </property> - </widget> - </item> - <item row="6" column="0" colspan="2"> - <widget class="QCheckBox" name="logCheckBox"> - <property name="toolTip"> - <string>Select to append transplant info to the log message</string> - </property> - <property name="text"> - <string>Append Transplant &Info</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="7" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>revisionsEdit</tabstop> - <tabstop>repoEdit</tabstop> - <tabstop>branchesCombo</tabstop> - <tabstop>allCheckBox</tabstop> - <tabstop>pruneEdit</tabstop> - <tabstop>mergeEdit</tabstop> - <tabstop>logCheckBox</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>TransplantDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>231</x> - <y>372</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>212</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>TransplantDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>299</x> - <y>372</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>212</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/__init__.py Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the transplant extension support interface. -"""
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the transplant extension interface. -""" - -from __future__ import unicode_literals - -import os - -from PyQt5.QtWidgets import QDialog - -from ..HgExtension import HgExtension -from ..HgDialog import HgDialog - - -class Transplant(HgExtension): - """ - Class implementing the transplant extension interface. - """ - def __init__(self, vcs): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - """ - super(Transplant, self).__init__(vcs) - - def hgTransplant(self, path): - """ - Public method to transplant changesets from another branch. - - @param path directory name of the project (string) - @return flag indicating that the project should be reread (boolean) - """ - # find the root of the repo - repodir = self.vcs.splitPath(path)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return False - - from .TransplantDialog import TransplantDialog - res = False - dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: - revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = \ - dlg.getData() - - args = self.vcs.initCommand("transplant") - args.append("--verbose") - if sourceRepo: - args.append("--source") - args.append(sourceRepo) - if branch: - args.append("--branch") - args.append(branch) - if all: - args.append("--all") - for pruneRev in pruneRevs: - args.append("--prune") - args.append(pruneRev) - for mergeRev in mergeRevs: - args.append("--merge") - args.append(mergeRev) - if log: - args.append("--log") - args.extend(revs) - - dia = HgDialog(self.tr('Transplant Changesets'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res - - def hgTransplantContinue(self, path): - """ - Public method to continue transplanting changesets from another branch. - - @param path directory name of the project (string) - @return flag indicating that the project should be reread (boolean) - """ - # find the root of the repo - repodir = self.vcs.splitPath(path)[0] - while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): - repodir = os.path.dirname(repodir) - if os.path.splitdrive(repodir)[1] == os.sep: - return - - args = self.vcs.initCommand("transplant") - args.append("--continue") - args.append("--verbose") - - dia = HgDialog( - self.tr('Transplant Changesets (Continue)'), self.vcs) - res = dia.startProcess(args, repodir) - if res: - dia.exec_() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Aug 18 17:34:05 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Aug 23 12:21:46 2016 +0200 @@ -145,7 +145,6 @@ from .FetchExtension.fetch import Fetch from .PurgeExtension.purge import Purge from .GpgExtension.gpg import Gpg - from .TransplantExtension.transplant import Transplant from .RebaseExtension.rebase import Rebase from .ShelveExtension.shelve import Shelve from .LargefilesExtension.largefiles import Largefiles @@ -154,7 +153,6 @@ "fetch": Fetch(self), "purge": Purge(self), "gpg": Gpg(self), - "transplant": Transplant(self), "rebase": Rebase(self), "shelve": Shelve(self), "largefiles": Largefiles(self) @@ -3461,21 +3459,6 @@ """ extensionName = extensionName.strip() isActive = extensionName in self.__activeExtensions - if isActive and \ - extensionName == "transplant" and \ - self.version >= (2, 3): - # transplant extension is deprecated as of Mercurial 2.3.0 - isActive = False - if isActive and \ - extensionName == "shelve" and \ - self.version < (2, 8): - # shelve extension was added as of Mercurial 2.8.0 - isActive = False - if isActive and \ - extensionName == "largefiles" and \ - self.version < (2, 0): - # largefiles extension was added as of Mercurial 2.0.0 - isActive = False return isActive
--- a/Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmark.style Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -changeset = 'change|{rev}:{node|short}\nuser|{author|email}\nparents|{parents}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbranches|{branches}\ntags|{tags}\nbookmarks|{bookmarks}\n@@@\n' -file_mod = '{file_mod}, ' -last_file_mod = '{file_mod}' -file_add = '{file_add}, ' -last_file_add = '{file_add}' -file_del = '{file_del}, ' -last_file_del = '{file_del}' -file_copy = '{name} ({source}), ' -last_file_copy = '{name} ({source})' -tag = '{tag}, ' -last_tag = '{tag}' -branch = '{branch}, ' -last_branch = '{branch}' -bookmark = '{bookmark}, ' -last_bookmark = '{bookmark}'
--- a/Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmarkPhase.style Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -changeset = 'change|{rev}:{node|short}\nuser|{author|email}\nparents|{parents}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbranches|{branches}\ntags|{tags}\nbookmarks|{bookmarks}\nphase|{phase}\n@@@\n' -file_mod = '{file_mod}, ' -last_file_mod = '{file_mod}' -file_add = '{file_add}, ' -last_file_add = '{file_add}' -file_del = '{file_del}, ' -last_file_del = '{file_del}' -file_copy = '{name} ({source}), ' -last_file_copy = '{name} ({source})' -tag = '{tag}, ' -last_tag = '{tag}' -branch = '{branch}, ' -last_branch = '{branch}' -bookmark = '{bookmark}, ' -last_bookmark = '{bookmark}'
--- a/Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmark.style Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -changeset = 'change|{rev}:{node|short}\nbranches|{branches}\ntags|{tags}\nparents|{parents}\nuser|{author}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbookmarks|{bookmarks}\n@@@\n' -file_mod = '{file_mod}, ' -last_file_mod = '{file_mod}' -file_add = '{file_add}, ' -last_file_add = '{file_add}' -file_del = '{file_del}, ' -last_file_del = '{file_del}' -file_copy = '{name} ({source}), ' -last_file_copy = '{name} ({source})' -tag = '{tag}, ' -last_tag = '{tag}' -branch = '{branch}, ' -last_branch = '{branch}' -bookmark = '{bookmark}, ' -last_bookmark = '{bookmark}'
--- a/Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmarkPhase.style Thu Aug 18 17:34:05 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -changeset = 'change|{rev}:{node|short}\nbranches|{branches}\ntags|{tags}\nparents|{parents}\nuser|{author}\ndate|{date|isodate}\ndescription|{desc}\nfile_copies|{file_copies}\nfile_adds|{file_adds}\nfiles_mods|{file_mods}\nfile_dels|{file_dels}\nbookmarks|{bookmarks}\nphase|{phase}\n@@@\n' -file_mod = '{file_mod}, ' -last_file_mod = '{file_mod}' -file_add = '{file_add}, ' -last_file_add = '{file_add}' -file_del = '{file_del}, ' -last_file_del = '{file_del}' -file_copy = '{name} ({source}), ' -last_file_copy = '{name} ({source})' -tag = '{tag}, ' -last_tag = '{tag}' -branch = '{branch}, ' -last_branch = '{branch}' -bookmark = '{bookmark}, ' -last_bookmark = '{bookmark}'
--- a/eric6.e4p Thu Aug 18 17:34:05 2016 +0200 +++ b/eric6.e4p Tue Aug 23 12:21:46 2016 +0200 @@ -659,10 +659,6 @@ <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/__init__.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/__init__.py</Source> - <Source>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/__init__.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/hg.py</Source> <Source>Plugins/VcsPlugins/vcsPySvn/Config.py</Source> @@ -1698,7 +1694,6 @@ <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui</Form> - <Form>Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui</Form> <Form>Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui</Form> @@ -2046,10 +2041,6 @@ <Other>Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other> <Other>Plugins/VcsPlugins/vcsMercurial/icons/stopServer.png</Other> - <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmark.style</Other> - <Other>Plugins/VcsPlugins/vcsMercurial/styles/logBrowserBookmarkPhase.style</Other> - <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmark.style</Other> - <Other>Plugins/VcsPlugins/vcsMercurial/styles/logDialogBookmarkPhase.style</Other> <Other>Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl</Other> <Other>Plugins/VcsPlugins/vcsMercurial/templates/logDialogBookmarkPhase.tmpl</Other> <Other>Plugins/VcsPlugins/vcsPySvn/icons/preferences-subversion.png</Other> @@ -2227,9 +2218,6 @@ </value> </dict> </VcsOptions> - <VcsOtherData> - <dict/> - </VcsOtherData> </Vcs> <FiletypeAssociations> <FiletypeAssociation pattern="*.idl" type="INTERFACES"/>
--- a/i18n/eric6_cs.ts Thu Aug 18 17:34:05 2016 +0200 +++ b/i18n/eric6_cs.ts Tue Aug 23 12:21:46 2016 +0200 @@ -6680,7 +6680,7 @@ <translation type="obsolete">Výběr interpretru pro Debug klienta</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="118"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="117"/> <source>All Files (*)</source> <translation>Všechny soubory (*)</translation> </message> @@ -21736,437 +21736,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="346"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="410"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="662"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="660"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="710"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1063"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1630"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <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="2473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2495"/> <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="2521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> <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="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <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="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <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="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2867"/> <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="2648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646"/> <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="2916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403"/> <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="3565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> <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="2984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2982"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3076"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3129"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3305"/> <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="3255"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> <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="3326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> <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="3326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3293"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2262"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2260"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3668"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3704"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3697"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3725"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3758"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3890"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3890"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1145"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1159"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/> + <source>Marking as 'unresolved'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> - <source>Marking as 'unresolved'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> @@ -25332,1407 +25332,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="121"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137"/> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148"/> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>Update from repository</source> <translation>Obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>&Update from repository</source> <translation>&Update: obnovit z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="169"/> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source>Commit changes to repository</source> <translation>Zapsat změny do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source>&Commit changes to repository...</source> <translation>&Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="196"/> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="201"/> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="204"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217"/> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249"/> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags</source> <translation>Seznam tagů</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches of the project</source> <translation>Seznam větví projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Create branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify the integrity of the repository</source> <translation>Ověřit integritu repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1780"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source>Mark a selectable changeset as bad</source> <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1308"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source>Push changes (force)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>Push changes to a remote repository with force option</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1288"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1597"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1891"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1856"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="966"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1878"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1876"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="985"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="988"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="997"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1365"/> <source>Graft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1891"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1029"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1027"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1037"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1373"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source>Show &status...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> <source>Show summary...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show summary information of the working directory status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="346"/> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1263"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="307"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="427"/> <source>Cancel uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Cancel an uncommitted merge and lose all changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1059"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1064"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1089"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1099"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1137"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152"/> <source>Pull bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1160"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1184"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1189"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192"/> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1201"/> <source>Push bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1208"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1206"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1209"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1332"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1316"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> <source>Manage Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1465"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1168"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1173"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1217"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> @@ -29039,16 +29039,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="150"/> - <source>Select to activate the transplant extension</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="153"/> - <source>Transplant</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> <source>Select to activate the rebase extension</source> <translation type="unfinished"></translation> @@ -29069,32 +29059,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="156"/> <source>Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="172"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="162"/> <source>Minimum file size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="169"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="175"/> <source> MB</source> <translation type="unfinished"> MB</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="201"/> <source>Patterns:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="208"/> <source>Enter file patterns (space separated) for files to be treated as Large Files</source> <translation type="unfinished"></translation> </message> @@ -39217,207 +39207,207 @@ <context> <name>Project</name> <message> - <location filename="../Project/Project.py" line="196"/> + <location filename="../Project/Project.py" line="164"/> <source>Ruby Files (*.rb);;</source> <translation>Ruby soubory (*.rb);;</translation> </message> <message> - <location filename="../Project/Project.py" line="277"/> + <location filename="../Project/Project.py" line="245"/> <source>Console</source> <translation>Konzole</translation> </message> <message> - <location filename="../Project/Project.py" line="278"/> + <location filename="../Project/Project.py" line="246"/> <source>Other</source> <translation>Ostatní</translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="699"/> <source>Read project file</source> <translation>Načíst soubor projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="799"/> <source>Save project file</source> <translation>Uložit soubor projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="835"/> <source>Read user project properties</source> <translation>Načíst uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="859"/> <source>Save user project properties</source> <translation>Uložit uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="917"/> <source>Read project session</source> <translation>Načíst relaci projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="1155"/> + <location filename="../Project/Project.py" line="1139"/> <source>Please save the project first.</source> <translation>Prosím, nejdříve uložte projekt.</translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="953"/> <source>Save project session</source> <translation>Uložit relaci projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="982"/> <source>Delete project session</source> <translation>Smazat relaci projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="1032"/> + <location filename="../Project/Project.py" line="1016"/> <source>Read tasks</source> <translation>Načíst úlohy</translation> </message> <message> - <location filename="../Project/Project.py" line="1052"/> + <location filename="../Project/Project.py" line="1036"/> <source>Save tasks</source> <translation>Uložit úlohy</translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1093"/> <source>Read debugger properties</source> <translation>Načíst nastavení debuggeru</translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1127"/> <source>Save debugger properties</source> <translation>Uložit nastavení debuggeru</translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1153"/> <source>Delete debugger properties</source> <translation>Smazat nastavení debuggeru</translation> </message> <message> - <location filename="../Project/Project.py" line="1267"/> + <location filename="../Project/Project.py" line="1261"/> <source>Add Language</source> <translation>Přidat jazyk</translation> </message> <message> - <location filename="../Project/Project.py" line="1391"/> + <location filename="../Project/Project.py" line="1383"/> <source>Delete translation</source> <translation>Smazat překlad</translation> </message> <message> - <location filename="../Project/Project.py" line="1542"/> + <location filename="../Project/Project.py" line="1534"/> <source>Add file</source> <translation>Přidat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1659"/> + <location filename="../Project/Project.py" line="1651"/> <source>The target directory must not be empty.</source> <translation>Cílový adresář nesmí být prázdný.</translation> </message> <message> - <location filename="../Project/Project.py" line="1670"/> + <location filename="../Project/Project.py" line="1662"/> <source>Add directory</source> <translation>Přidat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="1670"/> + <location filename="../Project/Project.py" line="1662"/> <source>The source directory must not be empty.</source> <translation>Cílový adresář nesmí být prázdný.</translation> </message> <message> - <location filename="../Project/Project.py" line="1794"/> + <location filename="../Project/Project.py" line="1786"/> <source>Rename file</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="1818"/> + <location filename="../Project/Project.py" line="1810"/> <source>Rename File</source> <translation>Přejmenovat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2054"/> + <location filename="../Project/Project.py" line="2046"/> <source>Delete file</source> <translation>Smazat soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2083"/> + <location filename="../Project/Project.py" line="2075"/> <source>Delete directory</source> <translation>Smazat adresář</translation> </message> <message> - <location filename="../Project/Project.py" line="2166"/> + <location filename="../Project/Project.py" line="2157"/> <source>Create project directory</source> <translation>Vytvořit adresář projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="2695"/> + <location filename="../Project/Project.py" line="2681"/> <source>New Project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2243"/> + <location filename="../Project/Project.py" line="2233"/> <source>Add existing files to the project?</source> <translation>Přidat existující soubory do projektu?</translation> </message> <message> - <location filename="../Project/Project.py" line="2362"/> + <location filename="../Project/Project.py" line="2352"/> <source>Would you like to edit the VCS command options?</source> <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="../Project/Project.py" line="3446"/> + <location filename="../Project/Project.py" line="3435"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2310"/> + <location filename="../Project/Project.py" line="2300"/> <source>Shall the project file be added to the repository?</source> <translation>Má být projekt přidán do repozitáře?</translation> </message> <message> - <location filename="../Project/Project.py" line="2334"/> + <location filename="../Project/Project.py" line="2324"/> <source>Select version control system for the project</source> <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3460"/> + <location filename="../Project/Project.py" line="3449"/> <source>Open project</source> <translation>Otevřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2829"/> + <location filename="../Project/Project.py" line="2813"/> <source>Project Files (*.e4p)</source> <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3497"/> + <location filename="../Project/Project.py" line="3486"/> <source>Save project as</source> <translation>Uložit projekt jako</translation> </message> <message> - <location filename="../Project/Project.py" line="2844"/> + <location filename="../Project/Project.py" line="2828"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../Project/Project.py" line="2880"/> + <location filename="../Project/Project.py" line="2864"/> <source>Close Project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="2880"/> + <location filename="../Project/Project.py" line="2864"/> <source>The current project has unsaved changes.</source> <translation>Aktuální projekt obsahuje neuložené změny.</translation> </message> <message> - <location filename="../Project/Project.py" line="3043"/> + <location filename="../Project/Project.py" line="3027"/> <source>Syntax errors detected</source> <translation>Zjištěny syntaktické chyby</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="3043"/> + <location filename="../Project/Project.py" line="3027"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Projekt obsahuje %n soubor se syntaktickými chybami.</numerusform> @@ -39426,958 +39416,958 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="3446"/> + <location filename="../Project/Project.py" line="3435"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../Project/Project.py" line="3451"/> + <location filename="../Project/Project.py" line="3440"/> <source>Generate a new project</source> <translation>Vygenerovat nový projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="3452"/> + <location filename="../Project/Project.py" line="3441"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3460"/> + <location filename="../Project/Project.py" line="3449"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../Project/Project.py" line="3465"/> + <location filename="../Project/Project.py" line="3454"/> <source>Open an existing project</source> <translation>Otevřít existující projekt</translation> </message> <message> + <location filename="../Project/Project.py" line="3455"/> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3462"/> + <source>Close project</source> + <translation>Zavřít projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3462"/> + <source>&Close</source> + <translation>&Zavřít</translation> + </message> + <message> <location filename="../Project/Project.py" line="3466"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3473"/> - <source>Close project</source> - <translation>Zavřít projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3473"/> - <source>&Close</source> - <translation>&Zavřít</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3477"/> <source>Close the current project</source> <translation>Uzavře aktuální projekt</translation> </message> <message> + <location filename="../Project/Project.py" line="3467"/> + <source><b>Close</b><p>This closes the current project.</p></source> + <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3474"/> + <source>Save project</source> + <translation>Uložit projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3665"/> + <source>&Save</source> + <translation>&Uložit</translation> + </message> + <message> <location filename="../Project/Project.py" line="3478"/> - <source><b>Close</b><p>This closes the current project.</p></source> - <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3485"/> - <source>Save project</source> - <translation>Uložit projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3676"/> - <source>&Save</source> - <translation>&Uložit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3489"/> <source>Save the current project</source> <translation>Uložit aktuální projekt</translation> </message> <message> + <location filename="../Project/Project.py" line="3479"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3486"/> + <source>Save &as...</source> + <translation>Uložit j&ako...</translation> + </message> + <message> <location filename="../Project/Project.py" line="3490"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3497"/> - <source>Save &as...</source> - <translation>Uložit j&ako...</translation> + <source>Save the current project to a new file</source> + <translation>Uloží aktuální projekt do nového souboru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3492"/> + <source><b>Save as</b><p>This saves the current project to a new file.</p></source> + <translation><b>Uložit jako</b><p>Uloží aktuální projekt do nového souboru.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3501"/> + <source>Add files to project</source> + <translation>Přidat soubory do projektu</translation> </message> <message> <location filename="../Project/Project.py" line="3501"/> - <source>Save the current project to a new file</source> - <translation>Uloží aktuální projekt do nového souboru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3503"/> - <source><b>Save as</b><p>This saves the current project to a new file.</p></source> - <translation><b>Uložit jako</b><p>Uloží aktuální projekt do nového souboru.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3512"/> - <source>Add files to project</source> - <translation>Přidat soubory do projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3512"/> <source>Add &files...</source> <translation>&Přidat soubory...</translation> </message> <message> + <location filename="../Project/Project.py" line="3506"/> + <source>Add files to the current project</source> + <translation>Přidat soubory do aktuálního projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3508"/> + <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> + <translation><b>Přidat soubory...</b><p>Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3517"/> + <source>Add directory to project</source> + <translation>Přidat adresář do projektu</translation> + </message> + <message> <location filename="../Project/Project.py" line="3517"/> - <source>Add files to the current project</source> - <translation>Přidat soubory do aktuálního projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3519"/> - <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> - <translation><b>Přidat soubory...</b><p>Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3528"/> - <source>Add directory to project</source> - <translation>Přidat adresář do projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3528"/> <source>Add directory...</source> <translation>Přidat adresář...</translation> </message> <message> - <location filename="../Project/Project.py" line="3533"/> + <location filename="../Project/Project.py" line="3522"/> <source>Add a directory to the current project</source> <translation>Přidat adresář do aktuálního projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3524"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Přidat adresář...</b><p>Otevře dialog pro přičtení adresáře do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3543"/> + <location filename="../Project/Project.py" line="3532"/> <source>Add translation to project</source> <translation>Přidat překlad do projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3543"/> + <location filename="../Project/Project.py" line="3532"/> <source>Add &translation...</source> <translation>Přida&t překlad...</translation> </message> <message> - <location filename="../Project/Project.py" line="3548"/> + <location filename="../Project/Project.py" line="3537"/> <source>Add a translation to the current project</source> <translation>Přidat překlad do aktuálního projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3550"/> + <location filename="../Project/Project.py" line="3539"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Přidat překlad</b><p>Otevře dialog pro přidání překladu do aktuálního projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3558"/> + <location filename="../Project/Project.py" line="3547"/> <source>Search new files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="3558"/> + <location filename="../Project/Project.py" line="3547"/> <source>Searc&h new files...</source> <translation>&Hledat nové soubory...</translation> </message> <message> - <location filename="../Project/Project.py" line="3562"/> + <location filename="../Project/Project.py" line="3551"/> <source>Search new files in the project directory.</source> <translation>Hledat nové soubory v adresáři projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3564"/> + <location filename="../Project/Project.py" line="3553"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Hledat nové soubory...</b><p>Hledají se nové soubory (zdrojové, *.ui, *.idl) v adresáři projektu a v registrovaných podadresářích.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3587"/> + <location filename="../Project/Project.py" line="3576"/> <source>Project properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3587"/> + <location filename="../Project/Project.py" line="3576"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3592"/> + <location filename="../Project/Project.py" line="3581"/> <source>Show the project properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3593"/> + <location filename="../Project/Project.py" line="3582"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3600"/> + <location filename="../Project/Project.py" line="3589"/> <source>User project properties</source> <translation>Uživatelská nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3600"/> + <location filename="../Project/Project.py" line="3589"/> <source>&User Properties...</source> <translation>Uživat&elská nastavení...</translation> </message> <message> - <location filename="../Project/Project.py" line="3605"/> + <location filename="../Project/Project.py" line="3594"/> <source>Show the user specific project properties</source> <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> </message> <message> - <location filename="../Project/Project.py" line="3607"/> + <location filename="../Project/Project.py" line="3596"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Uživatelská nastavení...</b><p>Zobrazí dialog s editací uživatelských nastavení projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3615"/> + <location filename="../Project/Project.py" line="3604"/> <source>Filetype Associations</source> <translation>Asociace typů souborů</translation> </message> <message> - <location filename="../Project/Project.py" line="3615"/> + <location filename="../Project/Project.py" line="3604"/> <source>Filetype Associations...</source> <translation>Asociace typů souborů...</translation> </message> <message> - <location filename="../Project/Project.py" line="3619"/> + <location filename="../Project/Project.py" line="3608"/> <source>Show the project filetype associations</source> <translation>Zobrazit asociace typů souborů</translation> </message> <message> - <location filename="../Project/Project.py" line="3621"/> + <location filename="../Project/Project.py" line="3610"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Asociace typů souborů...</b><p>Zobrazí se dialog s editací asociace typů souborů v projektu. Na základě vzorku souborového jména tyto asociace určují typ souboru (zdrojový kód, formulář, interface nebo jiné). Tyto asociace jsou použity při přidávání souborů do projektu a při vyhledávání.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3651"/> + <location filename="../Project/Project.py" line="3640"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3651"/> + <location filename="../Project/Project.py" line="3640"/> <source>Debugger &Properties...</source> <translation>Nastavení &debuggeru...</translation> </message> <message> - <location filename="../Project/Project.py" line="3655"/> + <location filename="../Project/Project.py" line="3644"/> <source>Show the debugger properties</source> <translation>Zobrazit nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3656"/> + <location filename="../Project/Project.py" line="3645"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Nastavení debugeru...</b><p>Zobrazí dialog s editací nastavení debugeru.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3664"/> + <location filename="../Project/Project.py" line="3653"/> <source>Load</source> <translation>Načíst</translation> </message> <message> - <location filename="../Project/Project.py" line="3664"/> + <location filename="../Project/Project.py" line="3653"/> <source>&Load</source> <translation>&Načíst</translation> </message> <message> - <location filename="../Project/Project.py" line="3668"/> + <location filename="../Project/Project.py" line="3657"/> <source>Load the debugger properties</source> <translation>Načíst nastavení debugeru</translation> </message> <message> + <location filename="../Project/Project.py" line="3658"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3665"/> + <source>Save</source> + <translation>Uložit</translation> + </message> + <message> <location filename="../Project/Project.py" line="3669"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3676"/> - <source>Save</source> - <translation>Uložit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3680"/> <source>Save the debugger properties</source> <translation>Uložit nastavení debugeru</translation> </message> <message> + <location filename="../Project/Project.py" line="3670"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3677"/> + <source>Delete</source> + <translation>Smazat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3677"/> + <source>&Delete</source> + <translation>Sma&zat</translation> + </message> + <message> <location filename="../Project/Project.py" line="3681"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3688"/> - <source>Delete</source> - <translation>Smazat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3688"/> - <source>&Delete</source> - <translation>Sma&zat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3692"/> <source>Delete the debugger properties</source> <translation>Smazat nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3693"/> + <location filename="../Project/Project.py" line="3682"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Smazat nastavení debugeru</b><p>Smaže se soubor obsahující nastavení debugeru v daném projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3701"/> + <location filename="../Project/Project.py" line="3690"/> <source>Reset</source> <translation></translation> </message> <message> - <location filename="../Project/Project.py" line="3701"/> + <location filename="../Project/Project.py" line="3690"/> <source>&Reset</source> <translation>&Reset</translation> </message> <message> - <location filename="../Project/Project.py" line="3705"/> + <location filename="../Project/Project.py" line="3694"/> <source>Reset the debugger properties</source> <translation>Reset nastavení debugeru</translation> </message> <message> - <location filename="../Project/Project.py" line="3706"/> + <location filename="../Project/Project.py" line="3695"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Reset nastavení debugeru</b><p>Zresetuje nastavení debugeru v projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3715"/> + <location filename="../Project/Project.py" line="3704"/> <source>Load session</source> <translation>Načíst relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="3719"/> + <location filename="../Project/Project.py" line="3708"/> <source>Load the projects session file.</source> <translation>Načíst soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3720"/> + <location filename="../Project/Project.py" line="3709"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Načíst relaci</b><p>Načte soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3733"/> + <location filename="../Project/Project.py" line="3722"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="3737"/> + <location filename="../Project/Project.py" line="3726"/> <source>Save the projects session file.</source> <translation>Uložit soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3738"/> + <location filename="../Project/Project.py" line="3727"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Uložit relaci</b><p>Uloží soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3751"/> + <location filename="../Project/Project.py" line="3740"/> <source>Delete session</source> <translation>Smazat relaci</translation> </message> <message> - <location filename="../Project/Project.py" line="3755"/> + <location filename="../Project/Project.py" line="3744"/> <source>Delete the projects session file.</source> <translation>Smaže soubor s relací projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3756"/> + <location filename="../Project/Project.py" line="3745"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Smazat relaci</b><p>Smaže soubor s relací projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3765"/> + <location filename="../Project/Project.py" line="3754"/> <source>Code Metrics</source> <translation>Metriky kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="3765"/> + <location filename="../Project/Project.py" line="3754"/> <source>&Code Metrics...</source> <translation>Metriky &kódu...</translation> </message> <message> - <location filename="../Project/Project.py" line="3769"/> + <location filename="../Project/Project.py" line="3758"/> <source>Show some code metrics for the project.</source> <translation>Zobrazit metriky kódu projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3771"/> + <location filename="../Project/Project.py" line="3760"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Metriky kódu...</b><p>Zobrazí se metriky kódu všech python souborů v projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3779"/> + <location filename="../Project/Project.py" line="3768"/> <source>Python Code Coverage</source> <translation>Pokrytí python kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="3779"/> + <location filename="../Project/Project.py" line="3768"/> <source>Code Co&verage...</source> <translation>Pokr&ytí kódu...</translation> </message> <message> - <location filename="../Project/Project.py" line="3783"/> + <location filename="../Project/Project.py" line="3772"/> <source>Show code coverage information for the project.</source> <translation>Zobrazit informace pokrytí kódu projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3785"/> + <location filename="../Project/Project.py" line="3774"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4568"/> + <location filename="../Project/Project.py" line="4557"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../Project/Project.py" line="3793"/> + <location filename="../Project/Project.py" line="3782"/> <source>&Profile Data...</source> <translation>&Profilovat data...</translation> </message> <message> + <location filename="../Project/Project.py" line="3786"/> + <source>Show profiling data for the project.</source> + <translation>Zobrazit profilování dat projektu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3788"/> + <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> + <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4611"/> + <source>Application Diagram</source> + <translation>Diagram aplikace</translation> + </message> + <message> <location filename="../Project/Project.py" line="3797"/> - <source>Show profiling data for the project.</source> - <translation>Zobrazit profilování dat projektu.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3799"/> - <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> - <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4622"/> - <source>Application Diagram</source> - <translation>Diagram aplikace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3808"/> <source>&Application Diagram...</source> <translation>Diagram &aplikace...</translation> </message> <message> - <location filename="../Project/Project.py" line="3812"/> + <location filename="../Project/Project.py" line="3801"/> <source>Show a diagram of the project.</source> <translation>Zobrazit diagram projektu.</translation> </message> <message> - <location filename="../Project/Project.py" line="3814"/> + <location filename="../Project/Project.py" line="3803"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagram aplikace...</b><p>Zobrazí diagram projektu.</p></translation> </message> <message> + <location filename="../Project/Project.py" line="3894"/> + <source>&Project</source> + <translation>&Projekt</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3895"/> + <source>Open &Recent Projects</source> + <translation>Otevřít poslední p&rojekty</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3896"/> + <source>&Version Control</source> + <translation>Kontrola &verzí</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3900"/> + <source>Chec&k</source> + <translation>Zkontro&lovat</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3902"/> + <source>Sho&w</source> + <translation>Zo&brazit</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3903"/> + <source>&Diagrams</source> + <translation>&Diagramy</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3904"/> + <source>Session</source> + <translation>Relace</translation> + </message> + <message> <location filename="../Project/Project.py" line="3905"/> - <source>&Project</source> - <translation>&Projekt</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3906"/> - <source>Open &Recent Projects</source> - <translation>Otevřít poslední p&rojekty</translation> + <source>Source &Documentation</source> + <translation>Zd&rojová dokumentace</translation> </message> <message> <location filename="../Project/Project.py" line="3907"/> - <source>&Version Control</source> - <translation>Kontrola &verzí</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3911"/> - <source>Chec&k</source> - <translation>Zkontro&lovat</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3913"/> - <source>Sho&w</source> - <translation>Zo&brazit</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3914"/> - <source>&Diagrams</source> - <translation>&Diagramy</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3915"/> - <source>Session</source> - <translation>Relace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3916"/> - <source>Source &Documentation</source> - <translation>Zd&rojová dokumentace</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3918"/> <source>Debugger</source> <translation></translation> </message> <message> - <location filename="../Project/Project.py" line="3919"/> + <location filename="../Project/Project.py" line="3908"/> <source>Pac&kagers</source> <translation>Balíč&ky</translation> </message> <message> - <location filename="../Project/Project.py" line="4027"/> + <location filename="../Project/Project.py" line="4016"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="../Project/Project.py" line="4093"/> + <location filename="../Project/Project.py" line="4082"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4220"/> <source>Search New Files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="../Project/Project.py" line="4231"/> + <location filename="../Project/Project.py" line="4220"/> <source>There were no new files found to be added.</source> <translation>Nebyly nalezeny žádné soubory, které je možné přidat.</translation> </message> <message> - <location filename="../Project/Project.py" line="4377"/> + <location filename="../Project/Project.py" line="4366"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="../Project/Project.py" line="4495"/> + <location filename="../Project/Project.py" line="4484"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4545"/> + <location filename="../Project/Project.py" line="4534"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation> </message> <message> - <location filename="../Project/Project.py" line="4518"/> + <location filename="../Project/Project.py" line="4507"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../Project/Project.py" line="4518"/> + <location filename="../Project/Project.py" line="4507"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="../Project/Project.py" line="4568"/> + <location filename="../Project/Project.py" line="4557"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../Project/Project.py" line="4622"/> + <location filename="../Project/Project.py" line="4611"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="../Project/Project.py" line="4780"/> + <location filename="../Project/Project.py" line="4769"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> <message> - <location filename="../Project/Project.py" line="3837"/> - <source>Create &Package List</source> - <translation>Vytvořit seznam &balíčků</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4973"/> - <source>Create Plugin Archive</source> - <translation>Vytvořit Plugin archiv</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3853"/> - <source>Create Plugin &Archive</source> - <translation>Vytvořit Plugin &archiv</translation> - </message> - <message> - <location filename="../Project/Project.py" line="4740"/> - <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> - <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4800"/> - <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> - <translation><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4809"/> - <source>The project does not have a main script defined. Aborting...</source> - <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1573"/> - <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> - <translation><p>Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2695"/> - <source>Select Version Control System</source> - <translation>Vybrat Version Control System</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2341"/> - <source>None</source> - <translation>None</translation> - </message> - <message> - <location filename="../Project/Project.py" line="375"/> - <source>Registering Project Type</source> - <translation>Zaregistrovat typ projektu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3869"/> - <source>Create Plugin Archive (Snapshot)</source> - <translation>Vytvořit archiv pluginů (snímek)</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3869"/> - <source>Create Plugin Archive (&Snapshot)</source> - <translation>Vytvořit archiv pluginů (&snímek)</translation> - </message> - <message> - <location filename="../Project/Project.py" line="1267"/> - <source>You have to specify a translation pattern first.</source> - <translation>Nejdříve musíte specifikovat vzor překladu.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2440"/> - <source>Translation Pattern</source> - <translation>Vzor překladu</translation> - </message> - <message> - <location filename="../Project/Project.py" line="2440"/> - <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> - <translation>Zadejte vzor cesty pro soubory s překlady (použijte '%language%' na místě s kódem jazyka):</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3633"/> - <source>Lexer Associations</source> - <translation>Spojení lexeru</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3633"/> - <source>Lexer Associations...</source> - <translation>Spojení lexeru...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3637"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3639"/> - <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> - <translation><b>Spojení lexeru...</b><p>Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="291"/> - <source>PySide GUI</source> - <translation></translation> - </message> - <message> - <location filename="../Project/Project.py" line="292"/> - <source>PySide Console</source> - <translation>PySide konzole</translation> - </message> - <message> - <location filename="../Project/Project.py" line="193"/> - <source>Python3 Files (*.py *.py3);;Python3 GUI Files (*.pyw *.pyw3);;</source> - <translation>Python3 soubory (*.py *.py3);;Python3 GUI soubory (*.pyw *.pyw3);;</translation> - </message> - <message> - <location filename="../Project/Project.py" line="715"/> - <source><p>The project file <b>{0}</b> could not be read.</p></source> - <translation><p>Soubor projektu <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="815"/> - <source><p>The project file <b>{0}</b> could not be written.</p></source> - <translation><p>Do souboru projektu <b>{0}</b> nelze zapisovat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="851"/> - <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> - <translation><p>Uživatelská nastavení projektu <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="875"/> - <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> - <translation><p>Do souboru s uživatelskými nastaveními <b>{0}</b> nelze zapisovat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="933"/> - <source><p>The project session file <b>{0}</b> could not be read.</p></source> - <translation><p>Soubor s relací projektu <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="969"/> - <source><p>The project session file <b>{0}</b> could not be written.</p></source> - <translation><p>Do souboru s relací projektu <b>{0}</b> nelze zapisovat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="998"/> - <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Soubor s relací projektu <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1032"/> - <source><p>The tasks file <b>{0}</b> could not be read.</p></source> - <translation><p>Soubor s úlohami <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1052"/> - <source><p>The tasks file <b>{0}</b> could not be written.</p></source> - <translation><p>Do souboru s úlohami <b>{0}</b> nelze zapisovat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1109"/> - <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> - <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze načíst.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1143"/> - <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> - <translation><p>Do souboru s nastaveními debuggeru <b>{0}</b> nelze zapisovat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1169"/> - <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1391"/> - <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Vybraný soubor s překladem <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1604"/> - <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> - <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2844"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1818"/> - <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> - <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2054"/> - <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> - <translation><p>Vybraný soubor <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2083"/> - <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> - <translation><p>Vybraný adresář <b>{0}</b> nelze smazat.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2166"/> - <source><p>The project directory <b>{0}</b> could not be created.</p></source> - <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4377"/> - <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> - <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4780"/> - <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> - <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4823"/> - <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> - <translation><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4862"/> - <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> - <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4931"/> - <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> - <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1530"/> - <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> - <translation><p>Vybraný soubor <b>{0}</b> nelze přidat do <b>{1}</b>.</p><p>Důvod: {2}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1586"/> - <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> - <translation><p>Cílový adresář <b>{0}</b> nelze vytvořit.</p><p>Důvod: {1}</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="190"/> - <source>Python2 Files (*.py2);;Python2 GUI Files (*.pyw2);;</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2230"/> - <source>Create main script</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2230"/> - <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3822"/> - <source>Load Diagram</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3822"/> - <source>&Load Diagram...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3826"/> - <source>Load a diagram from file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3828"/> - <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="352"/> - <source><p>The Programming Language <b>{0}</b> is not supported.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="375"/> - <source><p>The Project type <b>{0}</b> is already registered.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="363"/> - <source><p>The Project type <b>{0}</b> is already registered with Programming Language <b>{1}</b>.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="274"/> - <source>PyQt5 GUI</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="275"/> - <source>PyQt5 Console</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4366"/> - <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4973"/> - <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> - <translation type="unfinished"></translation> + <source>Create &Package List</source> + <translation>Vytvořit seznam &balíčků</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4961"/> + <source>Create Plugin Archive</source> + <translation>Vytvořit Plugin archiv</translation> </message> <message> <location filename="../Project/Project.py" line="3842"/> - <source>Create an initial PKGLIST file for an eric6 plugin.</source> - <translation type="unfinished">Vytvořit počáteční soubor PKGLIST pro eric5 plugin. {6 ?}</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3844"/> - <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> - <translation type="unfinished"><b>Vytvořit seznam balíčků</b><p>Vytvoří počáteční seznam souborů pro vložení do eric5 plugin archivu. Seznam je vytvořen ze souboru projektu.</p> {6 ?}</translation> + <source>Create Plugin &Archive</source> + <translation>Vytvořit Plugin &archiv</translation> + </message> + <message> + <location filename="../Project/Project.py" line="4729"/> + <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> + <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4789"/> + <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> + <translation><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4797"/> + <source>The project does not have a main script defined. Aborting...</source> + <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1565"/> + <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> + <translation><p>Zdrojový adresář neobsahuje žádné soubory související s danou kategorií.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2681"/> + <source>Select Version Control System</source> + <translation>Vybrat Version Control System</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2331"/> + <source>None</source> + <translation>None</translation> + </message> + <message> + <location filename="../Project/Project.py" line="344"/> + <source>Registering Project Type</source> + <translation>Zaregistrovat typ projektu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3858"/> + <source>Create Plugin Archive (Snapshot)</source> + <translation>Vytvořit archiv pluginů (snímek)</translation> </message> <message> <location filename="../Project/Project.py" line="3858"/> + <source>Create Plugin Archive (&Snapshot)</source> + <translation>Vytvořit archiv pluginů (&snímek)</translation> + </message> + <message> + <location filename="../Project/Project.py" line="1261"/> + <source>You have to specify a translation pattern first.</source> + <translation>Nejdříve musíte specifikovat vzor překladu.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2430"/> + <source>Translation Pattern</source> + <translation>Vzor překladu</translation> + </message> + <message> + <location filename="../Project/Project.py" line="2430"/> + <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> + <translation>Zadejte vzor cesty pro soubory s překlady (použijte '%language%' na místě s kódem jazyka):</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3622"/> + <source>Lexer Associations</source> + <translation>Spojení lexeru</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3622"/> + <source>Lexer Associations...</source> + <translation>Spojení lexeru...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3626"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3628"/> + <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> + <translation><b>Spojení lexeru...</b><p>Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="260"/> + <source>PySide GUI</source> + <translation></translation> + </message> + <message> + <location filename="../Project/Project.py" line="261"/> + <source>PySide Console</source> + <translation>PySide konzole</translation> + </message> + <message> + <location filename="../Project/Project.py" line="161"/> + <source>Python3 Files (*.py *.py3);;Python3 GUI Files (*.pyw *.pyw3);;</source> + <translation>Python3 soubory (*.py *.py3);;Python3 GUI soubory (*.pyw *.pyw3);;</translation> + </message> + <message> + <location filename="../Project/Project.py" line="699"/> + <source><p>The project file <b>{0}</b> could not be read.</p></source> + <translation><p>Soubor projektu <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="799"/> + <source><p>The project file <b>{0}</b> could not be written.</p></source> + <translation><p>Do souboru projektu <b>{0}</b> nelze zapisovat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="835"/> + <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> + <translation><p>Uživatelská nastavení projektu <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="859"/> + <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> + <translation><p>Do souboru s uživatelskými nastaveními <b>{0}</b> nelze zapisovat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="917"/> + <source><p>The project session file <b>{0}</b> could not be read.</p></source> + <translation><p>Soubor s relací projektu <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="953"/> + <source><p>The project session file <b>{0}</b> could not be written.</p></source> + <translation><p>Do souboru s relací projektu <b>{0}</b> nelze zapisovat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="982"/> + <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Soubor s relací projektu <b>{0}</b> nelze smazat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1016"/> + <source><p>The tasks file <b>{0}</b> could not be read.</p></source> + <translation><p>Soubor s úlohami <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1036"/> + <source><p>The tasks file <b>{0}</b> could not be written.</p></source> + <translation><p>Do souboru s úlohami <b>{0}</b> nelze zapisovat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1093"/> + <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> + <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze načíst.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1127"/> + <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> + <translation><p>Do souboru s nastaveními debuggeru <b>{0}</b> nelze zapisovat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1153"/> + <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Soubor s nastaveními debuggeru <b>{0}</b> nelze smazat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1383"/> + <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Vybraný soubor s překladem <b>{0}</b> nelze smazat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1596"/> + <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> + <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2828"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1810"/> + <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> + <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2046"/> + <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> + <translation><p>Vybraný soubor <b>{0}</b> nelze smazat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2075"/> + <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> + <translation><p>Vybraný adresář <b>{0}</b> nelze smazat.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2157"/> + <source><p>The project directory <b>{0}</b> could not be created.</p></source> + <translation><p>Adresář projektu <b>{0}</b> nelze vytvořit.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4366"/> + <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> + <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4769"/> + <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> + <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4811"/> + <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> + <translation><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4850"/> + <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> + <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4919"/> + <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> + <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1522"/> + <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> + <translation><p>Vybraný soubor <b>{0}</b> nelze přidat do <b>{1}</b>.</p><p>Důvod: {2}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1578"/> + <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> + <translation><p>Cílový adresář <b>{0}</b> nelze vytvořit.</p><p>Důvod: {1}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="158"/> + <source>Python2 Files (*.py2);;Python2 GUI Files (*.pyw2);;</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2220"/> + <source>Create main script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2220"/> + <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3811"/> + <source>Load Diagram</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3811"/> + <source>&Load Diagram...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3815"/> + <source>Load a diagram from file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3817"/> + <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="321"/> + <source><p>The Programming Language <b>{0}</b> is not supported.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="344"/> + <source><p>The Project type <b>{0}</b> is already registered.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="332"/> + <source><p>The Project type <b>{0}</b> is already registered with Programming Language <b>{1}</b>.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="242"/> + <source>PyQt5 GUI</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="243"/> + <source>PyQt5 Console</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4354"/> + <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4961"/> + <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3831"/> + <source>Create an initial PKGLIST file for an eric6 plugin.</source> + <translation type="unfinished">Vytvořit počáteční soubor PKGLIST pro eric5 plugin. {6 ?}</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3833"/> + <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> + <translation type="unfinished"><b>Vytvořit seznam balíčků</b><p>Vytvoří počáteční seznam souborů pro vložení do eric5 plugin archivu. Seznam je vytvořen ze souboru projektu.</p> {6 ?}</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3847"/> <source>Create an eric6 plugin archive file.</source> <translation type="unfinished">Vytvořit soubor eric5 plugin archivu. {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="3860"/> + <location filename="../Project/Project.py" line="3849"/> <source><b>Create Plugin Archive</b><p>This creates an eric6 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation type="unfinished"><b>Vytvořit Plugin archiv</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Jméno archivu je odvozeno ze jména hlavního skriptu.</p> {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="3874"/> + <location filename="../Project/Project.py" line="3863"/> <source>Create an eric6 plugin archive file (snapshot release).</source> <translation type="unfinished">Vytvoří se soubor eric5 plugin archívu (snímek vydání). {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="3876"/> + <location filename="../Project/Project.py" line="3865"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric6 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"><b>Vytvořit Plugin archiv (Snímek)</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Údaj o verzi hlavního skriptu je změněn v souladu se snímkem vydání.</p> {6 ?}</translation> </message> <message> - <location filename="../Project/Project.py" line="4836"/> + <location filename="../Project/Project.py" line="4824"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Soubor s eric5 plugin archivem <b>{0}</b> nelze vytvořit. Zrušeno...</p><p>Důvod: {1}</p> {6 ?} {0}?} {1}?}</translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4873"/> <source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p> {6 ?} {0}?}</translation> </message> <message> - <location filename="../Project/Project.py" line="272"/> + <location filename="../Project/Project.py" line="240"/> <source>PyQt4 GUI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="273"/> + <location filename="../Project/Project.py" line="241"/> <source>PyQt4 Console</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="276"/> + <location filename="../Project/Project.py" line="244"/> <source>Eric6 Plugin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2665"/> + <location filename="../Project/Project.py" line="2651"/> <source>Create project management directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2665"/> + <location filename="../Project/Project.py" line="2651"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> + <location filename="../Project/Project.py" line="3561"/> <source>Alt+Ctrl+P</source> <comment>Project|Search Project File</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3578"/> + <location filename="../Project/Project.py" line="3567"/> <source>Search for a file in the project list of files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3580"/> + <location filename="../Project/Project.py" line="3569"/> <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> + <location filename="../Project/Project.py" line="3561"/> <source>Search Project File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> + <location filename="../Project/Project.py" line="3561"/> <source>Search Project File...</source> <translation type="unfinished"></translation> </message> @@ -41835,12 +41825,12 @@ <translation>Generování souboru s překladem (*.ts) bylo úspěšné.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1251"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1250"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1165"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1164"/> <source>Translation file release</source> <translation>Zveřejnění souboru s překladem</translation> </message> @@ -41850,7 +41840,7 @@ <translation>Zveřejnění souboru s překladem (*.qm) bylo úspěšné.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1165"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1164"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Zveřejnění souboru s překladem (*.qm) selhalo.</translation> </message> @@ -41880,7 +41870,7 @@ <translation>Nelze spustit {0}.<br>Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1251"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1250"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit zveřejnění.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> @@ -42102,7 +42092,7 @@ <translation></translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="130"/> + <location filename="../Project/PropertiesDialog.py" line="111"/> <source>The project is not version controlled.</source> <translation>Projekt není pod správou verzovacího systému.</translation> </message> @@ -42158,7 +42148,7 @@ <translation>Nastavení kontroly pravopisu...</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="124"/> + <location filename="../Project/PropertiesDialog.py" line="105"/> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Projekt je pod správou verzovacího systému <b>{0}</b>.</translation> </message> @@ -59186,12 +59176,12 @@ <translation>Seznam cest nebo souborů pro provedení překladu formulářů</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="156"/> + <location filename="../Project/TranslationPropertiesDialog.py" line="150"/> <source>Exempt file from translation</source> <translation>Vyjmout soubor z překladu</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="169"/> + <location filename="../Project/TranslationPropertiesDialog.py" line="163"/> <source>Exempt directory from translation</source> <translation>Vyjmout adresář z překladu</translation> </message> @@ -59281,141 +59271,16 @@ </context> <context> <name>Transplant</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="73"/> - <source>Transplant Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="99"/> - <source>Transplant Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>TransplantDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="14"/> - <source>Transplant Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="23"/> - <source>&Revisions:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="49"/> - <source>Repositor&y:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="59"/> - <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="66"/> - <source>&Branch:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="76"/> - <source>Select or enter the branch to transplant from</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> - <source>Select to transplant all changesets of the branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="92"/> - <source>Transplant &All Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="99"/> - <source>&Skip:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="125"/> - <source>&Merge:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="135"/> - <source>Enter revisions to be merged separated by a space character</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="142"/> - <source>Select to append transplant info to the log message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="145"/> - <source>Append Transplant &Info</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="112"/> - <source>Enter changesets by number, id, range or revset expression one per line</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>TransplantProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="120"/> - <source>Transplant Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="56"/> - <source>Transplant changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="59"/> - <source><b>Transplant Changesets</b><p>This transplants changesets from another branch on top of the current working directory with the log of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="72"/> - <source>Continue the last transplant session after repair</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="111"/> - <source>Transplant</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="135"/> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="135"/> - <source>Transplant Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="68"/> - <source>Continue Transplant Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="75"/> - <source><b>Continue Transplant Session</b><p>This continues the last transplant session after repair.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py" line="95"/> - <source>Transplant is deprecated</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Projekt bude znovu načten. Má se provést?</translation> </message> </context> <context> @@ -70921,46 +70786,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2169"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1499"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1497"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -70968,12 +70833,12 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1535"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70984,13 +70849,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/i18n/eric6_de.ts Thu Aug 18 17:34:05 2016 +0200 +++ b/i18n/eric6_de.ts Tue Aug 23 12:21:46 2016 +0200 @@ -6405,7 +6405,7 @@ <context> <name>DebuggerPropertiesDialog</name> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="118"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="117"/> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> @@ -21335,437 +21335,437 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1873"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="348"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="346"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="362"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="410"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="662"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="660"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="712"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="710"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1063"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1632"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1630"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2033"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/> <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="2473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2471"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2495"/> <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="2521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2753"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2801"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> <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="2835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <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="2631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2629"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <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="2889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2869"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2867"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2646"/> <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="2916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="573"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3403"/> <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="3565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> <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="2984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2982"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3076"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3129"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3305"/> <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="3255"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3253"/> <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="3326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> <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="3326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3324"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3293"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3190"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1878"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2262"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2260"/> <source>Cancelling uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3668"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3693"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3704"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3697"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3725"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3765"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3758"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3890"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3890"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1145"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1154"/> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1159"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/> + <source>Marking as 'unresolved'</source> + <translation>Markiere als 'nicht aufgelöst'</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> - <source>Marking as 'unresolved'</source> - <translation>Markiere als 'nicht aufgelöst'</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2235"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> @@ -24896,1407 +24896,1407 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="116"/> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="121"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Erzeuge (klone) ein neues Projekt aus einem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="124"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Neu aus Repository</b><p>Dies erzeugt (clone) ein neues Projekt aus dem Mercurial-Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="132"/> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137"/> <source>Show the log of incoming changes</source> <translation>Zeige das Log eingehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zeige eingehendes Log</b><p>Dies zeigt das Log von Änderungen, die in das Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148"/> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> <source>&Update from repository</source> <translation>&Abgleich mit Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="169"/> <source>Update the local project from the Mercurial repository</source> <translation>Abgleich des lokalen Projektes mit dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="172"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Abgleich mit Repository</b><p>Dies gleicht das lokale Projekt mit dem Mercurial-Repository ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source>Commit changes to repository</source> <translation>Änderungen in Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="180"/> <source>&Commit changes to repository...</source> <translation>&Änderungen in Repository einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Änderungen am lokalen Projekt in das Mercurial-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Mercurial-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="196"/> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="201"/> <source>Show the log of outgoing changes</source> <translation>Zeige das Log ausgehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="204"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zeige ausgehendes Log</b><p>Dies zeigt das Log von Änderungen, die aus dem Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212"/> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217"/> <source>Push changes to a remote repository</source> <translation>Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="220"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Änderungen hochladen</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249"/> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source>Show &log</source> <translation>&Beschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> <source>Show the log of the local project</source> <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="363"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="386"/> <source>Show the tip of the repository</source> <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="413"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411"/> <source>Mer&ge changes...</source> <translation>Änderungen &zusammenführen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> <source>Merge changes of a revision into the local project</source> <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="508"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags</source> <translation>Marken listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="522"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> <source>List branches of the project</source> <translation>Listet Zweige des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Create branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="624"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="636"/> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Execute an arbitrary Mercurial command</source> <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="720"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="725"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source>Verify the integrity of the repository</source> <translation>Verfiziert die Integrität des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="767"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source>Create a .hgignore file with default values</source> <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="774"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1780"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1295"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="599"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"</source> <translation>Als „gut“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"</source> <translation>Als „schlecht“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> <source>Mark a selectable changeset as bad</source> <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="877"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1308"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="891"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>Push changes to a remote repository with force option</source> <translation>Änderungen an ein entferntes Repository mit der Option „force“ hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="236"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1288"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1286"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1599"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1597"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1893"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1891"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="570"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="863"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1838"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1856"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen<