Mon, 24 Feb 2014 19:27:39 +0100
Added support for the Mercurial shelve extension to the project browser VCS context menu.
--- a/APIs/Python3/eric5.api Mon Feb 24 18:46:32 2014 +0100 +++ b/APIs/Python3/eric5.api Mon Feb 24 19:27:39 2014 +0100 @@ -4527,6 +4527,9 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension.shutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension?1(vcs) +eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.initMenus?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.menuTitle?4() +eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper?1(vcsObject, browserObject, projectObject) eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.getActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.initMenu?4(mainMenu) @@ -4874,6 +4877,9 @@ eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog?1(message, shelveNames, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.HgUnshelveDataDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.HgUnshelveDataDialog?1(shelveNames, shelveName="", parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper.initMenus?4() +eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper.menuTitle?4() +eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper?1(vcsObject, browserObject, projectObject) eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.initMenu?4(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.menuTitle?4()
--- a/APIs/Python3/eric5.bas Mon Feb 24 18:46:32 2014 +0100 +++ b/APIs/Python3/eric5.bas Mon Feb 24 19:27:39 2014 +0100 @@ -313,6 +313,7 @@ HgDiffDialog QWidget Ui_HgDiffDialog HgExportDialog QDialog Ui_HgExportDialog HgExtension QObject +HgExtensionProjectBrowserHelper QObject HgExtensionProjectHelper QObject HgFetchDialog QDialog Ui_HgFetchDialog HgGpgSignDialog QDialog Ui_HgGpgSignDialog @@ -601,6 +602,7 @@ ShellHistoryDialog QDialog Ui_ShellHistoryDialog ShellPage ConfigurationPageBase Ui_ShellPage Shelve HgExtension +ShelveProjectBrowserHelper HgExtensionProjectBrowserHelper ShelveProjectHelper HgExtensionProjectHelper ShortcutDialog QDialog Ui_ShortcutDialog ShortcutsDialog QDialog Ui_ShortcutsDialog
--- a/Documentation/Help/source.qhp Mon Feb 24 18:46:32 2014 +0100 +++ b/Documentation/Help/source.qhp Mon Feb 24 19:27:39 2014 +0100 @@ -534,6 +534,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html" /> </section> @@ -557,6 +558,7 @@ <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html" /> + <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> <section title="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> @@ -6041,6 +6043,11 @@ <keyword name="HgExtension (Constructor)" id="HgExtension (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html#HgExtension.__init__" /> <keyword name="HgExtension (Module)" id="HgExtension (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html" /> <keyword name="HgExtension.shutdown" id="HgExtension.shutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html#HgExtension.shutdown" /> + <keyword name="HgExtensionProjectBrowserHelper" id="HgExtensionProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper" /> + <keyword name="HgExtensionProjectBrowserHelper (Constructor)" id="HgExtensionProjectBrowserHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.__init__" /> + <keyword name="HgExtensionProjectBrowserHelper (Module)" id="HgExtensionProjectBrowserHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html" /> + <keyword name="HgExtensionProjectBrowserHelper.initMenus" id="HgExtensionProjectBrowserHelper.initMenus" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.initMenus" /> + <keyword name="HgExtensionProjectBrowserHelper.menuTitle" id="HgExtensionProjectBrowserHelper.menuTitle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.menuTitle" /> <keyword name="HgExtensionProjectHelper" id="HgExtensionProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper" /> <keyword name="HgExtensionProjectHelper (Constructor)" id="HgExtensionProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.__init__" /> <keyword name="HgExtensionProjectHelper (Module)" id="HgExtensionProjectHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html" /> @@ -6237,6 +6244,8 @@ <keyword name="HgProjectBrowserHelper.__HgRevert" id="HgProjectBrowserHelper.__HgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgRevert" /> <keyword name="HgProjectBrowserHelper.__HgSbsDiff" id="HgProjectBrowserHelper.__HgSbsDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsDiff" /> <keyword name="HgProjectBrowserHelper.__HgSbsExtendedDiff" id="HgProjectBrowserHelper.__HgSbsExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsExtendedDiff" /> + <keyword name="HgProjectBrowserHelper.__addExtensionsMenu" id="HgProjectBrowserHelper.__addExtensionsMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__addExtensionsMenu" /> + <keyword name="HgProjectBrowserHelper.__showExtensionMenu" id="HgProjectBrowserHelper.__showExtensionMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__showExtensionMenu" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> <keyword name="HgProjectBrowserHelper._addVCSMenuBack" id="HgProjectBrowserHelper._addVCSMenuBack" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuBack" /> <keyword name="HgProjectBrowserHelper._addVCSMenuDir" id="HgProjectBrowserHelper._addVCSMenuDir" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenuDir" /> @@ -8923,6 +8932,7 @@ <keyword name="ProjectBrowserFileItem (Constructor)" id="ProjectBrowserFileItem (Constructor)" ref="eric5.Project.ProjectBrowserModel.html#ProjectBrowserFileItem.__init__" /> <keyword name="ProjectBrowserFlags (Module)" id="ProjectBrowserFlags (Module)" ref="eric5.Project.ProjectBrowserFlags.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" /> + <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric5.VCS.ProjectBrowserHelper.html" /> @@ -9985,6 +9995,12 @@ <keyword name="Shelve.hgUnshelveContinue" id="Shelve.hgUnshelveContinue" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgUnshelveContinue" /> <keyword name="Shelve.shutdown" id="Shelve.shutdown" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.shutdown" /> <keyword name="ShelveExtension (Package)" id="ShelveExtension (Package)" ref="index-eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html" /> + <keyword name="ShelveProjectBrowserHelper" id="ShelveProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper" /> + <keyword name="ShelveProjectBrowserHelper (Constructor)" id="ShelveProjectBrowserHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__init__" /> + <keyword name="ShelveProjectBrowserHelper.__hgShelve" id="ShelveProjectBrowserHelper.__hgShelve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__hgShelve" /> + <keyword name="ShelveProjectBrowserHelper.__reopenProject" id="ShelveProjectBrowserHelper.__reopenProject" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__reopenProject" /> + <keyword name="ShelveProjectBrowserHelper.initMenus" id="ShelveProjectBrowserHelper.initMenus" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.initMenus" /> + <keyword name="ShelveProjectBrowserHelper.menuTitle" id="ShelveProjectBrowserHelper.menuTitle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.menuTitle" /> <keyword name="ShelveProjectHelper" id="ShelveProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper" /> <keyword name="ShelveProjectHelper (Constructor)" id="ShelveProjectHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__init__" /> <keyword name="ShelveProjectHelper.__hgCleanupShelves" id="ShelveProjectHelper.__hgCleanupShelves" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgCleanupShelves" /> @@ -14032,6 +14048,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file> @@ -14078,6 +14095,7 @@ <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html</file> + <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html</file> <file>eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.ProjectHelper.html</file>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html Mon Feb 24 19:27:39 2014 +0100 @@ -0,0 +1,136 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper</h1> +<p> +Module implementing the project browser helper base for Mercurial extension +interfaces. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgExtensionProjectBrowserHelper">HgExtensionProjectBrowserHelper</a></td> +<td>Class implementing the project browser helper base for Mercurial extension interfaces.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HgExtensionProjectBrowserHelper" ID="HgExtensionProjectBrowserHelper"></a> +<h2>HgExtensionProjectBrowserHelper</h2> +<p> + Class implementing the project browser helper base for Mercurial extension + interfaces. +</p><p> + Note: The methods initMenus() and menuTitle() have to be reimplemented by + derived classes. +</p> +<h3>Derived from</h3> +QObject +<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="#HgExtensionProjectBrowserHelper.__init__">HgExtensionProjectBrowserHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HgExtensionProjectBrowserHelper.initMenus">initMenus</a></td> +<td>Public method to generate the extension menus.</td> +</tr><tr> +<td><a href="#HgExtensionProjectBrowserHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HgExtensionProjectBrowserHelper.__init__" ID="HgExtensionProjectBrowserHelper.__init__"></a> +<h4>HgExtensionProjectBrowserHelper (Constructor)</h4> +<b>HgExtensionProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject</i>) +<p> + Constructor +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>browserObject</i></dt> +<dd> +reference to the project browser object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> +</dl><a NAME="HgExtensionProjectBrowserHelper.initMenus" ID="HgExtensionProjectBrowserHelper.initMenus"></a> +<h4>HgExtensionProjectBrowserHelper.initMenus</h4> +<b>initMenus</b>(<i></i>) +<p> + Public method to generate the extension menus. +</p><p> + Note: Derived class must implement this method. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary of populated menu (dict of QMenu). The dict + must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + and 'dirMultiMenu'. +</dd> +</dl><dl> +<dt>Raises <b>NotImplementedError</b>:</dt> +<dd> +raised if the class has not been + reimplemented +</dd> +</dl><a NAME="HgExtensionProjectBrowserHelper.menuTitle" ID="HgExtensionProjectBrowserHelper.menuTitle"></a> +<h4>HgExtensionProjectBrowserHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p><p> + Note: Derived class must implement this method. +</p><dl> +<dt>Returns:</dt> +<dd> +title of the menu (string) +</dd> +</dl><dl> +<dt>Raises <b>NotImplementedError</b>:</dt> +<dd> +raised if the class has not been + reimplemented +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Mon Feb 24 18:46:32 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Mon Feb 24 19:27:39 2014 +0100 @@ -90,6 +90,12 @@ <td><a href="#HgProjectBrowserHelper.__HgSbsExtendedDiff">__HgSbsExtendedDiff</a></td> <td>Private slot called by the context menu to show the difference of a file to the repository side-by-side.</td> </tr><tr> +<td><a href="#HgProjectBrowserHelper.__addExtensionsMenu">__addExtensionsMenu</a></td> +<td>Private method to add an extension menu entry.</td> +</tr><tr> +<td><a href="#HgProjectBrowserHelper.__showExtensionMenu">__showExtensionMenu</a></td> +<td>Private slot showing the extensions menu.</td> +</tr><tr> <td><a href="#HgProjectBrowserHelper._addVCSMenu">_addVCSMenu</a></td> <td>Protected method used to add the VCS menu to all project browsers.</td> </tr><tr> @@ -208,7 +214,37 @@ file to the repository side-by-side. </p><p> It allows the selection of revisions to compare. -</p><a NAME="HgProjectBrowserHelper._addVCSMenu" ID="HgProjectBrowserHelper._addVCSMenu"></a> +</p><a NAME="HgProjectBrowserHelper.__addExtensionsMenu" ID="HgProjectBrowserHelper.__addExtensionsMenu"></a> +<h4>HgProjectBrowserHelper.__addExtensionsMenu</h4> +<b>__addExtensionsMenu</b>(<i>menu, key</i>) +<p> + Private method to add an extension menu entry. +</p><dl> +<dt><i>menu</i></dt> +<dd> +menu to add it to (QMenu) +</dd><dt><i>key</i></dt> +<dd> +menu key (string, one of 'mainMenu', 'multiMenu', + 'backMenu', 'dirMenu' or 'dirMultiMenu') +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the menu action (QAction) +</dd> +</dl><a NAME="HgProjectBrowserHelper.__showExtensionMenu" ID="HgProjectBrowserHelper.__showExtensionMenu"></a> +<h4>HgProjectBrowserHelper.__showExtensionMenu</h4> +<b>__showExtensionMenu</b>(<i>key</i>) +<p> + Private slot showing the extensions menu. +</p><dl> +<dt><i>key</i></dt> +<dd> +menu key (string, one of 'mainMenu', 'multiMenu', + 'backMenu', 'dirMenu' or 'dirMultiMenu') +</dd> +</dl><a NAME="HgProjectBrowserHelper._addVCSMenu" ID="HgProjectBrowserHelper._addVCSMenu"></a> <h4>HgProjectBrowserHelper._addVCSMenu</h4> <b>_addVCSMenu</b>(<i>mainMenu</i>) <p>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html Mon Feb 24 19:27:39 2014 +0100 @@ -0,0 +1,144 @@ +<!DOCTYPE html> +<html><head> +<title>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper</h1> +<p> +Module implementing the shelve extension project browser helper. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#ShelveProjectBrowserHelper">ShelveProjectBrowserHelper</a></td> +<td>Class implementing the shelve extension project browser helper.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="ShelveProjectBrowserHelper" ID="ShelveProjectBrowserHelper"></a> +<h2>ShelveProjectBrowserHelper</h2> +<p> + Class implementing the shelve extension project browser helper. +</p> +<h3>Derived from</h3> +HgExtensionProjectBrowserHelper +<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="#ShelveProjectBrowserHelper.__init__">ShelveProjectBrowserHelper</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#ShelveProjectBrowserHelper.__hgShelve">__hgShelve</a></td> +<td>Private slot used to shelve all current changes.</td> +</tr><tr> +<td><a href="#ShelveProjectBrowserHelper.__reopenProject">__reopenProject</a></td> +<td>Private method to reopen the project if needed and wanted.</td> +</tr><tr> +<td><a href="#ShelveProjectBrowserHelper.initMenus">initMenus</a></td> +<td>Public method to generate the extension menus.</td> +</tr><tr> +<td><a href="#ShelveProjectBrowserHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="ShelveProjectBrowserHelper.__init__" ID="ShelveProjectBrowserHelper.__init__"></a> +<h4>ShelveProjectBrowserHelper (Constructor)</h4> +<b>ShelveProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject</i>) +<p> + Constructor +</p><dl> +<dt><i>vcsObject</i></dt> +<dd> +reference to the vcs object +</dd><dt><i>browserObject</i></dt> +<dd> +reference to the project browser object +</dd><dt><i>projectObject</i></dt> +<dd> +reference to the project object +</dd> +</dl><a NAME="ShelveProjectBrowserHelper.__hgShelve" ID="ShelveProjectBrowserHelper.__hgShelve"></a> +<h4>ShelveProjectBrowserHelper.__hgShelve</h4> +<b>__hgShelve</b>(<i></i>) +<p> + Private slot used to shelve all current changes. +</p><a NAME="ShelveProjectBrowserHelper.__reopenProject" ID="ShelveProjectBrowserHelper.__reopenProject"></a> +<h4>ShelveProjectBrowserHelper.__reopenProject</h4> +<b>__reopenProject</b>(<i>shouldReopen, title</i>) +<p> + Private method to reopen the project if needed and wanted. +</p><dl> +<dt><i>shouldReopen</i></dt> +<dd> +flag indicating that the project should + be reopened (boolean) +</dd><dt><i>title</i></dt> +<dd> +title of the message box (string) +</dd> +</dl><a NAME="ShelveProjectBrowserHelper.initMenus" ID="ShelveProjectBrowserHelper.initMenus"></a> +<h4>ShelveProjectBrowserHelper.initMenus</h4> +<b>initMenus</b>(<i></i>) +<p> + Public method to generate the extension menus. +</p><p> + Note: Derived class must implement this method. +</p><dl> +<dt>Returns:</dt> +<dd> +dictionary of populated menu (dict of QMenu). The dict + must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + and 'dirMultiMenu'. +</dd> +</dl><a NAME="ShelveProjectBrowserHelper.menuTitle" ID="ShelveProjectBrowserHelper.menuTitle"></a> +<h4>ShelveProjectBrowserHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p><p> + Note: Derived class must implement this method. +</p><dl> +<dt>Returns:</dt> +<dd> +title of the menu (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html Mon Feb 24 18:46:32 2014 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html Mon Feb 24 19:27:39 2014 +0100 @@ -40,6 +40,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html">HgUnshelveDataDialog</a></td> <td>Module implementing a dialog to enter the data for an unshelve operation.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html">ProjectBrowserHelper</a></td> +<td>Module implementing the shelve extension project browser helper.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html">ProjectHelper</a></td> <td>Module implementing the shelve extension project helper.</td> </tr><tr>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Mon Feb 24 18:46:32 2014 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Mon Feb 24 19:27:39 2014 +0100 @@ -107,6 +107,9 @@ <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtension.html">HgExtension</a></td> <td>Module implementing the base class for Mercurial extension interfaces.</td> </tr><tr> +<td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html">HgExtensionProjectBrowserHelper</a></td> +<td>Module implementing the project browser helper base for Mercurial extension interfaces.</td> +</tr><tr> <td><a href="eric5.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html">HgExtensionProjectHelper</a></td> <td>Module implementing the project helper base for Mercurial extension interfaces.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Mon Feb 24 19:27:39 2014 +0100 @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the project browser helper base for Mercurial extension +interfaces. +""" + +from PyQt4.QtCore import QObject + + +class HgExtensionProjectBrowserHelper(QObject): + """ + Class implementing the project browser helper base for Mercurial extension + interfaces. + + Note: The methods initMenus() and menuTitle() have to be reimplemented by + derived classes. + """ + def __init__(self, vcsObject, browserObject, projectObject): + """ + Constructor + + @param vcsObject reference to the vcs object + @param browserObject reference to the project browser object + @param projectObject reference to the project object + """ + super().__init__() + + self.vcs = vcsObject + self.browser = browserObject + self.project = projectObject + + def initMenus(self): + """ + Public method to generate the extension menus. + + Note: Derived class must implement this method. + + @ireturn dictionary of populated menu (dict of QMenu). The dict + must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + and 'dirMultiMenu'. + @exception NotImplementedError raised if the class has not been + reimplemented + """ + raise NotImplementedError + + def menuTitle(self): + """ + Public method to get the menu title. + + Note: Derived class must implement this method. + + @ireturn title of the menu (string) + @exception NotImplementedError raised if the class has not been + reimplemented + """ + raise NotImplementedError
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Feb 24 18:46:32 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Feb 24 19:27:39 2014 +0100 @@ -38,6 +38,39 @@ VcsProjectBrowserHelper.__init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, parent, name) + + # instantiate the extensions + from .ShelveExtension.ProjectBrowserHelper import \ + ShelveProjectBrowserHelper + self.__extensions = { + "shelve": ShelveProjectBrowserHelper(vcsObject, browserObject, + projectObject), + } + + self.__extensionMenuTitles = {} + for extension in self.__extensions: + self.__extensionMenuTitles[ + self.__extensions[extension].menuTitle()] = extension + self.__extensionMenus = {} + for extension in self.__extensions: + self.__extensionMenus[extension] = \ + self.__extensions[extension].initMenus() + + def __showExtensionMenu(self, key): + """ + Private slot showing the extensions menu. + + @param key menu key (string, one of 'mainMenu', 'multiMenu', + 'backMenu', 'dirMenu' or 'dirMultiMenu') + """ + for extensionName in self.__extensionMenus: + if key in self.__extensionMenus[extensionName]: + self.__extensionMenus[extensionName][key].setEnabled( + self.vcs.isExtensionActive(extensionName)) + if (not self.__extensionMenus[extensionName][key].isEnabled() + and self.__extensionMenus[extensionName][key] + .isTearOffMenuVisible()): + self.__extensionMenus[extensionName][key].hideTearOffMenu() def showContextMenu(self, menu, standardItems): """ @@ -59,6 +92,7 @@ act.setEnabled(False) if not hasattr(self.browser.currentItem(), 'fileName'): self.annotateAct.setEnabled(False) + self.__showExtensionMenu("mainMenu") else: for act in self.vcsMenuActions: act.setEnabled(False) @@ -97,6 +131,7 @@ act.setEnabled(False) for act in standardItems: act.setEnabled(False) + self.__showExtensionMenu("multiMenu") else: for act in self.vcsMultiMenuActions: act.setEnabled(False) @@ -123,6 +158,7 @@ act.setEnabled(False) for act in standardItems: act.setEnabled(False) + self.__showExtensionMenu("dirMenu") else: for act in self.vcsDirMenuActions: act.setEnabled(False) @@ -161,6 +197,7 @@ act.setEnabled(False) for act in standardItems: act.setEnabled(False) + self.__showExtensionMenu("dirMultiMenu") else: for act in self.vcsDirMultiMenuActions: act.setEnabled(False) @@ -168,11 +205,40 @@ act.setEnabled(True) for act in standardItems: act.setEnabled(True) - + + ########################################################################### + ## Private menu generation methods below ########################################################################### - # Protected menu generation methods below + + def __addExtensionsMenu(self, menu, key): + """ + Private method to add an extension menu entry. + + @param menu menu to add it to (QMenu) + @param key menu key (string, one of 'mainMenu', 'multiMenu', + 'backMenu', 'dirMenu' or 'dirMultiMenu') + @return reference to the menu action (QAction) + """ + act = None + if key in ['mainMenu', 'multiMenu', 'backMenu', 'dirMenu', + 'dirMultiMenu']: + extensionsMenu = QMenu(self.tr("Extensions"), menu) + extensionsMenu.setTearOffEnabled(True) + for extensionMenuTitle in sorted(self.__extensionMenuTitles): + extensionName = self.__extensionMenuTitles[extensionMenuTitle] + if key in self.__extensionMenus[extensionName]: + extensionsMenu.addMenu( + self.__extensionMenus[extensionName][key]) + if not extensionsMenu.isEmpty(): + if not menu.isEmpty(): + menu.addSeparator() + act = menu.addMenu(extensionsMenu) + return act + ########################################################################### - + ## Protected menu generation methods below + ########################################################################### + def _addVCSMenu(self, mainMenu): """ Protected method used to add the VCS menu to all project browsers. @@ -199,6 +265,9 @@ self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) + act = self.__addExtensionsMenu(menu, 'mainMenu') + if act: + self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsAdd.png"), @@ -307,6 +376,9 @@ self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) + act = self.__addExtensionsMenu(menu, 'multiMenu') + if act: + self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsAdd.png"), @@ -421,6 +493,9 @@ self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) + act = self.__addExtensionsMenu(menu, 'dirMenu') + if act: + self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsAdd.png"), @@ -512,6 +587,9 @@ self.tr('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) + act = self.__addExtensionsMenu(menu, 'dirMultiMenu') + if act: + self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsAdd.png"), @@ -561,7 +639,7 @@ self.menuDirMulti = menu ########################################################################### - # Menu handling methods below + ## Menu handling methods below ########################################################################### def __HgRevert(self):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Mon Feb 24 19:27:39 2014 +0100 @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the shelve extension project browser helper. +""" + +from PyQt4.QtGui import QMenu + +from E5Gui import E5MessageBox + +from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper + + +class ShelveProjectBrowserHelper(HgExtensionProjectBrowserHelper): + """ + Class implementing the shelve extension project browser helper. + """ + def __init__(self, vcsObject, browserObject, projectObject): + """ + Constructor + + @param vcsObject reference to the vcs object + @param browserObject reference to the project browser object + @param projectObject reference to the project object + """ + super().__init__(vcsObject, browserObject, projectObject) + + def initMenus(self): + """ + Public method to generate the extension menus. + + Note: Derived class must implement this method. + + @return dictionary of populated menu (dict of QMenu). The dict + must have the keys 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + and 'dirMultiMenu'. + """ + self.__menus = {} + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus['mainMenu'] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus['multiMenu'] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus['dirMenu'] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus['dirMultiMenu'] = menu + + return self.__menus + + def menuTitle(self): + """ + Public method to get the menu title. + + Note: Derived class must implement this method. + + @return title of the menu (string) + """ + return self.tr("Shelve") + + def __reopenProject(self, shouldReopen, title): + """ + Private method to reopen the project if needed and wanted. + + @param shouldReopen flag indicating that the project should + be reopened (boolean) + @param title title of the message box (string) + """ + if shouldReopen: + res = E5MessageBox.yesNo( + None, + title, + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True) + if res: + self.project.reopenProject() + + def __hgShelve(self): + """ + Private slot used to shelve all current changes. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + shouldReopen = self.vcs.getExtensionObject("shelve")\ + .hgShelve(names) + self.__reopenProject(shouldReopen, self.tr("Shelve"))
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Feb 24 18:46:32 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Feb 24 19:27:39 2014 +0100 @@ -3243,8 +3243,6 @@ @param path name of the changed file (string) """ - self.__getExtensionsInfo() - if self.__client: ok, err = self.__client.restartServer() if not ok: @@ -3256,6 +3254,8 @@ """ restarted.</p><p>Reason: {0}</p>""").format(err)) self.__client = None + self.__getExtensionsInfo() + if self.__repoIniFile and path == self.__repoIniFile: self.__checkDefaults()
--- a/eric5.e4p Mon Feb 24 18:46:32 2014 +0100 +++ b/eric5.e4p Mon Feb 24 19:27:39 2014 +0100 @@ -1119,6 +1119,8 @@ <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py</Source> <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py</Source> + <Source>Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form> @@ -1599,73 +1601,97 @@ <string>add</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>checkout</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>commit</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>diff</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>export</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>global</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>history</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>log</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>remove</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>status</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>tag</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> <key> <string>update</string> </key> <value> - <list/> + <list> + <string></string> + </list> </value> </dict> </VcsOptions>
--- a/i18n/eric5_cs.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_cs.ts Mon Feb 24 19:27:39 2014 +0100 @@ -20021,7 +20021,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -22929,22 +22929,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> @@ -22959,7 +22959,7 @@ <translation type="obsolete">Přesunout v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> @@ -22969,32 +22969,32 @@ <translation type="obsolete">Zobrazit limitovaný log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation>Zobrazit komentované soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> @@ -23004,27 +23004,27 @@ <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation>Vybrat všechny lokální soubory</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation>Odebrat jen z repozitáře</translation> </message> @@ -23034,35 +23034,40 @@ <translation type="obsolete">Opravdu chcete odebrat tyto soubory s překlady z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -45972,6 +45977,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_de.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_de.ts Mon Feb 24 19:27:39 2014 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1939,8 +1938,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -2176,8 +2175,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -15846,8 +15845,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19171,7 +19170,7 @@ <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> <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> @@ -22050,115 +22049,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> + <source>Commit changes to repository...</source> + <translation>Änderungen einpflegen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> + <source>Add to repository</source> + <translation>Zum Repository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> + <source>Show log</source> + <translation>Beschreibungen anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <source>Show difference</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <source>Show difference (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> + <source>Show annotated file</source> + <translation>Zeige kommentierte Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> + <source>Select all versioned directory entries</source> + <translation>Alle versionierten Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <source>Conflict resolved</source> + <translation>Konflikt gelöst</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> - <source>Commit changes to repository...</source> - <translation>Änderungen einpflegen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> - <source>Show status</source> - <translation>Status anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> - <source>Show difference (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> - <source>Show annotated file</source> - <translation>Zeige kommentierte Datei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> - <source>Select all local directory entries</source> - <translation>Alle lokalen Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> - <source>Select all versioned directory entries</source> - <translation>Alle versionierten Verzeichniseinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Remove from repository only</source> - <translation>Nur vom Repository löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> - <source>Conflict resolved</source> - <translation>Konflikt gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation>Verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation>Erweiterungen</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -22629,26 +22633,6 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> - <source>Command options</source> - <translation type="obsolete">Befehlsoptionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> - <source>Command &options...</source> - <translation type="obsolete">Befehls&optionen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Show the Mercurial command options</source> - <translation type="obsolete">Zeigt die Mercurial-Befehlsoptionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="obsolete"><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial-Befehlsoptionen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> <source>Configure</source> <translation>Einstellungen</translation> </message> @@ -43807,6 +43791,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation>Änderungen ablegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation>Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_en.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_en.ts Mon Feb 24 19:27:39 2014 +0100 @@ -19066,7 +19066,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -21904,115 +21904,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> + <source>Add to repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> + <source>Show log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <source>Show difference (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Add to repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Remove from repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> - <source>Show annotated file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -43389,6 +43394,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_es.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_es.ts Mon Feb 24 19:27:39 2014 +0100 @@ -19170,7 +19170,7 @@ <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3272"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> @@ -22051,115 +22051,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> + <source>Commit changes to repository...</source> + <translation>Hacer commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> + <source>Add to repository</source> + <translation>Añadir al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <source>Remove from repository (and disk)</source> + <translation>Eliminar del repositorio (y del disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> + <source>Show log</source> + <translation>Mostrar log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <source>Show difference</source> + <translation>Mostrar diferencia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> + <source>Show difference (extended)</source> + <translation>Mostrar diferencia (extendida)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorio locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> + <source>Select all versioned directory entries</source> + <translation>Seleccionar todas las entradas de directorio versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Remove from repository only</source> + <translation>Eliminar solamente del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> + <source>Conflict resolved</source> + <translation>Conflicto resuelto</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> - <source>Commit changes to repository...</source> - <translation>Hacer commit de los cambios al repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Add to repository</source> - <translation>Añadir al repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> - <source>Remove from repository (and disk)</source> - <translation>Eliminar del repositorio (y del disco)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> - <source>Show difference</source> - <translation>Mostrar diferencia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> - <source>Show difference (extended)</source> - <translation>Mostrar diferencia (extendida)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> - <source>Select all versioned file entries</source> - <translation>Seleccionar todas las entradas de archivo versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> - <source>Select all local directory entries</source> - <translation>Seleccionar todas las entradas de directorio locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> - <source>Select all versioned directory entries</source> - <translation>Seleccionar todas las entradas de directorio versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> - <source>Show annotated file</source> - <translation>Mostrar archivo anotado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Remove from repository only</source> - <translation>Eliminar solamente del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> - <source>Conflict resolved</source> - <translation>Conflicto resuelto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> <source>Copy</source> <translation>Copiar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation>Mover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation>Mostrar diferencias lado a lado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation>Mostrar diferencias lado a lado (extendido)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished">Extensiones</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -43811,6 +43816,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_fr.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_fr.ts Mon Feb 24 19:27:39 2014 +0100 @@ -21017,7 +21017,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -23926,22 +23926,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> @@ -23956,7 +23956,7 @@ <translation type="obsolete">Déplacer dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> @@ -23966,32 +23966,32 @@ <translation type="obsolete">Afficher un log limité</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation type="unfinished">Afficher les différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation type="unfinished">Afficher les différences (étendu)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation type="unfinished">Afficher les fichiers annotés</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> @@ -24001,60 +24001,65 @@ <translation type="obsolete">Résoudre les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation type="unfinished">Copier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -48311,6 +48316,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_it.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_it.ts Mon Feb 24 19:27:39 2014 +0100 @@ -19920,7 +19920,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -22837,22 +22837,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> @@ -22867,7 +22867,7 @@ <translation type="obsolete">Muovi nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation>Mostra log</translation> </message> @@ -22877,32 +22877,32 @@ <translation type="obsolete">Mostra log ridotto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation>Mostra differenza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation>Mostra differenza (esteso)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation>Mostra file appuntati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> @@ -22912,27 +22912,27 @@ <translation type="obsolete">Risolvi conflitti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation>Seleziona tutt i file locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> @@ -22942,35 +22942,40 @@ <translation type="obsolete">Vuoi veramente rimuovere questi file di traduzione dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation type="unfinished">Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -46091,6 +46096,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_ru.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_ru.ts Mon Feb 24 19:27:39 2014 +0100 @@ -20060,7 +20060,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -22977,22 +22977,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -23007,7 +23007,7 @@ <translation type="obsolete">Переместить в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation>Показать журнал</translation> </message> @@ -23017,17 +23017,17 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> @@ -23037,42 +23037,42 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> @@ -23082,35 +23082,40 @@ <translation type="obsolete">Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation>Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation>Сдвинуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -46225,6 +46230,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_tr.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_tr.ts Mon Feb 24 19:27:39 2014 +0100 @@ -19986,7 +19986,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -22885,27 +22885,27 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> @@ -22920,7 +22920,7 @@ <translation type="obsolete">Kaynak havuzuna taşı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> @@ -22930,32 +22930,32 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation>Farkları göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation>Açıklama dosyalarını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> @@ -22965,22 +22965,22 @@ <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation>tüm yerel dosyalırın girişini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> @@ -22990,35 +22990,40 @@ <translation type="obsolete">Gerçekten bu çeviri dosyalarını kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation type="unfinished">Kopyala</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -45529,6 +45534,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon Feb 24 18:46:32 2014 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon Feb 24 19:27:39 2014 +0100 @@ -20934,7 +20934,7 @@ <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><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -23843,22 +23843,22 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="594"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库(和磁盘)中移除</translation> </message> @@ -23873,7 +23873,7 @@ <translation type="obsolete">在储存库中移动</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="515"/> <source>Show log</source> <translation type="unfinished">显示日志</translation> </message> @@ -23883,32 +23883,32 @@ <translation type="obsolete">显示受限日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="519"/> <source>Show log browser</source> <translation type="unfinished">显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604"/> <source>Show status</source> <translation type="unfinished">显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Show difference</source> <translation type="unfinished">显示差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Show difference (extended)</source> <translation type="unfinished">显示差异(扩展)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="325"/> <source>Show annotated file</source> <translation type="unfinished">显示有注释的文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> @@ -23918,60 +23918,65 @@ <translation type="obsolete">解析冲突</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="627"/> <source>Select all local file entries</source> <translation type="unfinished">选择所有本地文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629"/> <source>Select all versioned file entries</source> <translation type="unfinished">选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="631"/> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="633"/> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781"/> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> <source>Conflict resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> <source>Copy</source> <translation type="unfinished">复制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="311"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="320"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="225"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -48242,6 +48247,24 @@ </message> </context> <context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="60"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="105"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="84"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ShelveProjectHelper</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/>