--- a/i18n/eric5_en.ts Wed Apr 02 19:08:31 2014 +0200
+++ b/i18n/eric5_en.ts Thu Apr 03 19:12:51 2014 +0200
@@ -19417,12 +19417,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/>
<source>Process Generation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
@@ -22044,16 +22044,6 @@
<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>
@@ -22104,13 +22094,23 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/>
+ <source>Show differences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/>
- <source>Show difference side-by-side</source>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/>
+ <source>Show differences (extended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/>
- <source>Show difference side-by-side (extended)</source>
+ <source>Show differences side-by-side (extended)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -22308,11 +22308,6 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/>
- <source>Show difference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/>
<source>Show &difference</source>
<translation type="unfinished"></translation>
</message>
@@ -22322,26 +22317,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/>
- <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/>
- <source>Show difference (extended)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
- <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/>
<source>Show status</source>
<translation type="unfinished"></translation>
@@ -23241,6 +23221,26 @@
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/>
+ <source>Show differences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/>
+ <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/>
+ <source>Show differences (extended)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
+ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -46920,21 +46920,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/>
- <source>Show difference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/>
- <source>Show difference (extended)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/>
- <source>Show difference (URLs)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="293"/>
<source>Show annotated file</source>
<translation type="unfinished"></translation>
@@ -47030,13 +47015,28 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/>
+ <source>Show differences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/>
- <source>Show difference side-by-side</source>
+ <source>Show differences side-by-side</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/>
+ <source>Show differences (extended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/>
- <source>Show difference side-by-side (extended)</source>
+ <source>Show differences side-by-side (extended)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/>
+ <source>Show differences (URLs)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -47139,11 +47139,6 @@
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/>
- <source>Show difference</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/>
<source>Show &difference</source>
<translation type="unfinished"></translation>
</message>
@@ -47153,41 +47148,16 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/>
- <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/>
- <source>Show difference (extended)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/>
- <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/>
- <source>Show difference (URLs)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/>
<source>Show the difference of the project between two repository URLs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/>
- <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="176"/>
<source>Show status</source>
<translation type="unfinished"></translation>
@@ -47617,6 +47587,36 @@
<source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/>
+ <source>Show differences</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/>
+ <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/>
+ <source>Show differences (extended)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/>
+ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/>
+ <source>Show differences (URLs)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/>
+ <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SvnPropDelDialog</name>
