--- a/i18n/eric5_en.ts Sat May 05 19:23:18 2012 +0200
+++ b/i18n/eric5_en.ts Wed May 09 20:07:29 2012 +0200
@@ -970,17 +970,17 @@
<context>
<name>ApplicationDiagram</name>
<message>
- <location filename="Graphics/ApplicationDiagram.py" line="63"/>
+ <location filename="Graphics/ApplicationDiagram.py" line="67"/>
<source>Parsing modules...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/ApplicationDiagram.py" line="183"/>
+ <location filename="Graphics/ApplicationDiagram.py" line="187"/>
<source><<Application>></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/ApplicationDiagram.py" line="185"/>
+ <location filename="Graphics/ApplicationDiagram.py" line="189"/>
<source><<Others>></source>
<translation type="unfinished"></translation>
</message>
@@ -3989,42 +3989,42 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="107"/>
<source>Create Dialog Code</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="107"/>
<source>The file <b>{0}</b> exists but does not contain any classes.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="281"/>
<source>uic error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="281"/>
<source><p>There was an error loading the form <b>{0}</b>.</p><p>{1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="435"/>
<source>Code Generation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="326"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="332"/>
<source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="359"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="365"/>
<source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
+ <location filename="Project/CreateDialogCodeDialog.py" line="435"/>
<source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -16415,237 +16415,237 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="525"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="705"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="834"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/>
<source>Taging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="867"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="917"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1156"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1346"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1591"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1763"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/>
<source>Resolving files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1795"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2069"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/>
- <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/>
- <source>Identifying changegroup file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/>
- <source>Apply changegroups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/>
+ <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+ <source>Identifying changegroup file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/>
+ <source>Apply changegroups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2214"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2248"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2336"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2316"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="473"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2521"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2568"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
@@ -17470,6 +17470,16 @@
<source>Select a recent commit message to use</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="60"/>
+ <source>Select to amend the last commit (leave message empty to keep it)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="63"/>
+ <source>Amend the last commit</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgCopyDialog</name>
@@ -23406,12 +23416,12 @@
<context>
<name>ImportsDiagram</name>
<message>
- <location filename="Graphics/ImportsDiagram.py" line="77"/>
+ <location filename="Graphics/ImportsDiagram.py" line="79"/>
<source>Parsing modules...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/ImportsDiagram.py" line="105"/>
+ <location filename="Graphics/ImportsDiagram.py" line="108"/>
<source>The directory <b>'{0}'</b> is not a Python package.</source>
<translation type="unfinished"></translation>
</message>
@@ -27039,22 +27049,22 @@
<context>
<name>PackageDiagram</name>
<message>
- <location filename="Graphics/PackageDiagram.py" line="79"/>
+ <location filename="Graphics/PackageDiagram.py" line="81"/>
<source>Parsing modules...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/PackageDiagram.py" line="109"/>
+ <location filename="Graphics/PackageDiagram.py" line="111"/>
<source>The directory <b>'{0}'</b> is not a package.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/PackageDiagram.py" line="117"/>
+ <location filename="Graphics/PackageDiagram.py" line="119"/>
<source>The package <b>'{0}'</b> does not contain any modules.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/PackageDiagram.py" line="132"/>
+ <location filename="Graphics/PackageDiagram.py" line="134"/>
<source>The package <b>'{0}'</b> does not contain any classes.</source>
<translation type="unfinished"></translation>
</message>
@@ -35244,7 +35254,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="UI/SearchWidget.py" line="163"/>
+ <location filename="UI/SearchWidget.py" line="165"/>
<source>'{0}' was not found.</source>
<translation type="unfinished"></translation>
</message>
@@ -45637,12 +45647,12 @@
<context>
<name>UMLClassDiagram</name>
<message>
- <location filename="Graphics/UMLClassDiagram.py" line="69"/>
+ <location filename="Graphics/UMLClassDiagram.py" line="72"/>
<source>The module <b>'{0}'</b> could not be found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Graphics/UMLClassDiagram.py" line="130"/>
+ <location filename="Graphics/UMLClassDiagram.py" line="133"/>
<source>The module <b>'{0}'</b> does not contain any classes.</source>
<translation type="unfinished"></translation>
</message>
@@ -52548,30 +52558,30 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1216"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1232"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1262"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -52582,23 +52592,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1725"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1728"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -52606,7 +52616,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
