--- a/eric6/i18n/eric6_en.ts Fri Aug 23 13:23:22 2019 +0200
+++ b/eric6/i18n/eric6_en.ts Fri Aug 23 13:23:36 2019 +0200
@@ -6868,11 +6868,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugUI.py" line="597"/>
- <source>&Start</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Debugger/DebugUI.py" line="599"/>
<source>&Breakpoints</source>
<translation type="unfinished"></translation>
@@ -7078,6 +7073,11 @@
<source>No locals available.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Debugger/DebugUI.py" line="597"/>
+ <source>Sta&rt</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>DebugViewer</name>
@@ -31090,7 +31090,7 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
@@ -31120,420 +31120,420 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
<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="2576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/>
<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="2597"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/>
<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="544"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/>
<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="3523"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/>
<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="2886"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<source>Revert changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/>
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/>
<source>Current branch tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/>
<source>Delete Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/>
<source>Re-Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/>
<source>Do you really want to re-merge these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/>
<source>Do you really want to re-merge the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/>
<source>Re-Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<source>Marking as 'unresolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/>
- <source>Canceling uncommitted merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/>
<source>Copy Changesets (Stop)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/>
<source>Copy Changesets (Abort)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+ <source>Aborting uncommitted merge</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -35280,742 +35280,742 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
<source>Tag in repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/>
<source>&Tag in repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/>
- <source>Tag the local project in the repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/>
- <source>List tags</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/>
- <source>List tags...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/>
- <source>List tags of the project</source>
+ <source>Tag the local project in the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
- <source>List branches</source>
+ <source>List tags</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
- <source>List branches...</source>
+ <source>List tags...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/>
- <source>List branches of the project</source>
+ <source>List tags of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
- <source>Create branch</source>
+ <source>List branches</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
+ <source>List branches...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/>
+ <source>List branches of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
+ <source>Create branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/>
<source>Create &branch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/>
<source>Create a new branch for the local project in the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/>
<source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/>
<source>Close branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/>
- <source>Close the current branch of the local project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/>
- <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
- <source>Show current branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/>
- <source>Show the current branch of the project</source>
+ <source>Close the current branch of the local project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/>
- <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
+ <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <source>Show current branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/>
+ <source>Show the current branch of the project</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/>
+ <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/>
<source>S&witch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/>
<source>Switch the working directory to another revision</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/>
<source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
- <source>Cleanup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
- <source>Cleanu&p</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/>
- <source>Cleanup the local project</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
- <source>Execute command</source>
+ <source>Cleanup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/>
- <source>E&xecute command...</source>
+ <source>Cleanu&p</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/>
- <source>Execute an arbitrary Mercurial command</source>
+ <source>Cleanup the local project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <source>Execute command</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <source>E&xecute command...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
<source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
<source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/>
<source>Configure...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/>
<source>Show the configuration dialog with the Mercurial page selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/>
- <source>Show paths</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/>
- <source>Show paths...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <source>Show the aliases for remote repositories</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
- <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
- <source>Verify repository</source>
+ <source>Show paths</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/>
- <source>Verify repository...</source>
+ <source>Show paths...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
- <source>Verify the integrity of the repository</source>
+ <source>Show the aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
+ <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
- <source>Recover</source>
+ <source>Verify repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
- <source>Recover...</source>
+ <source>Verify repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/>
- <source>Recover from an interrupted transaction</source>
+ <source>Verify the integrity of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/>
- <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
+ <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
- <source>Identify</source>
+ <source>Recover</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
- <source>Identify...</source>
+ <source>Recover...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/>
- <source>Identify the project directory</source>
+ <source>Recover from an interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/>
- <source><b>Identify</b><p>This identifies the project directory.</p></source>
+ <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
- <source>Create .hgignore</source>
+ <source>Identify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/>
+ <source>Identify...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
- <source>Create a .hgignore file with default values</source>
+ <source>Identify the project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/>
- <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
- <source>Create changegroup</source>
+ <source><b>Identify</b><p>This identifies the project directory.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
+ <source>Create .hgignore</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/>
+ <source>Create changegroup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/>
<source>Create changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/>
<source>Create changegroup file collecting changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/>
<source>Preview changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
<source>Preview a changegroup file containing a collection of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/>
<source>Apply changegroups...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
<source>Apply one or several changegroup files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
<source>Mark as "good"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
- <source>Mark as "good"...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/>
- <source>Mark a selectable changeset as good</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/>
- <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
- <source>Mark as "bad"</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
- <source>Mark as "bad"...</source>
+ <source>Mark as "good"...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/>
- <source>Mark a selectable changeset as bad</source>
+ <source>Mark a selectable changeset as good</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/>
- <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
+ <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/>
+ <source>Mark as "bad"</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/>
- <source>Skip</source>
+ <source>Mark as "bad"...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
+ <source>Mark a selectable changeset as bad</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
+ <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
- <source>Reset</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
- <source>Reset the bisect search data</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
- <source><b>Reset</b><p>This resets the bisect search data.</p></source>
+ <source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/>
- <source>Back out changeset</source>
+ <source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/>
- <source>Back out changes of an earlier changeset</source>
+ <source>Reset the bisect search data</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/>
- <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
- <source>Serve project repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
- <source>Serve project repository...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/>
- <source>Serve the project repository</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/>
- <source><b>Serve project repository</b><p>This serves the project repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/>
- <source>Specials</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/>
- <source>Changegroup Management</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/>
- <source>Bisect</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/>
- <source>Pull</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/>
- <source>The project should be reread. Do this now?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/>
- <source>Push new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/>
- <source>Push the current branch of the local project as a new named branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/>
- <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
+ <source><b>Reset</b><p>This resets the bisect search data.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/>
- <source>Rollback last transaction</source>
+ <source>Back out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
+ <source>Back out changes of an earlier changeset</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/>
+ <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <source>Serve project repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <source>Serve project repository...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/>
+ <source>Serve the project repository</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
+ <source><b>Serve project repository</b><p>This serves the project repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/>
+ <source>Specials</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/>
+ <source>Changegroup Management</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/>
+ <source>Bisect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/>
+ <source>Pull</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/>
+ <source>The project should be reread. Do this now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/>
+ <source>Push new branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/>
+ <source>Push the current branch of the local project as a new named branch</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/>
+ <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/>
+ <source>Rollback last transaction</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/>
<source>Rollback the last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Edit user configuration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/>
- <source>Edit user configuration...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Show an editor to edit the user configuration file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
- <source>Edit repository configuration</source>
+ <source>Edit user configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/>
- <source>Edit repository configuration...</source>
+ <source>Edit user configuration...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
- <source>Show an editor to edit the repository configuration file</source>
+ <source>Show an editor to edit the user configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <source>Edit repository configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/>
+ <source>Edit repository configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
<source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
<source>Show combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/>
<source>Show combined configuration settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
<source>Show the combined configuration settings from all configuration files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
<source>Skip...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
<source>Skip a selectable changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/>
<source>Import Patch...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/>
<source>Import a patch from a patch file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/>
<source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/>
<source>Patch Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/>
<source>Export Patches...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
- <source>Export revisions to patch files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/>
- <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/>
- <source>Change Phase</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/>
- <source>Change Phase...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/>
- <source>Change the phase of revisions</source>
+ <source>Export revisions to patch files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/>
+ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
+ <source>Change Phase</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/>
+ <source>Change Phase...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/>
+ <source>Change the phase of revisions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/>
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/>
<source>Copies changesets from another branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/>
<source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/>
<source>Continue Copying Session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/>
<source>Continue the last copying session after conflicts were resolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/>
<source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
<source>Conflicts resolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/>
<source>Con&flicts resolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/>
<source>Mark all conflicts of the local project as resolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/>
<source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/>
<source>Add...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/>
<source>Add a sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/>
<source><b>Add...</b><p>Add a sub-repository to the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/>
<source>Remove...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/>
<source>Remove sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/>
<source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/>
<source>Sub-Repository</source>
<translation type="unfinished"></translation>
</message>
@@ -36045,32 +36045,32 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
<source>Create unversioned archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/>
<source>Create unversioned archive...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/>
<source>Create an unversioned archive from the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/>
<source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/>
<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="1312"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/>
<source>Administration</source>
<translation type="unfinished"></translation>
</message>
@@ -36095,340 +36095,355 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
- <source>Cancel uncommitted merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
- <source>Cancel an uncommitted merge and lose all changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
- <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/>
<source>List bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/>
<source>List bookmarks...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/>
<source>List bookmarks of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/>
<source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
<source>Define bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/>
<source>Define bookmark...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/>
<source>Define a bookmark for the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/>
<source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
<source>Delete bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/>
<source>Delete bookmark...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/>
<source>Delete a bookmark of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/>
<source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
<source>Rename bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/>
<source>Rename bookmark...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/>
<source>Rename a bookmark of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/>
<source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/>
<source>Move bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/>
<source>Move bookmark...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/>
<source>Move a bookmark of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/>
<source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/>
<source>Show incoming bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/>
<source>Show a list of incoming bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/>
- <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/>
- <source>Pull bookmark</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/>
+ <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/>
+ <source>Pull bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/>
<source>Pull a bookmark from a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/>
<source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/>
<source>Show outgoing bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/>
<source>Show a list of outgoing bookmarks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/>
- <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/>
- <source>Push bookmark</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/>
+ <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/>
+ <source>Push bookmark</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/>
<source>Push a bookmark to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/>
<source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/>
+ <source>Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/>
- <source>Bookmarks</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/>
<source>Tags</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/>
<source>Branches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/>
<source>Re-Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/>
<source>Re-Merge all conflicting, unresolved files of the project</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/>
<source>Show conflicts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/>
<source>Show conflicts...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
<source>Show a dialog listing all files with conflicts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
<source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
<source>Conflicts unresolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/>
<source>Mark all conflicts of the local project as unresolved</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/>
<source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/>
<source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/>
<source>Mercurial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/>
<source>Pull current bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/>
<source>Pull the current bookmark from a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/>
<source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/>
<source>Push current bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/>
<source>Push the current bookmark to a remote repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
- <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
- <source>Delete all backups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
+ <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/>
+ <source>Delete all backups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/>
<source>Delete all backup bundles stored in the backup area</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/>
<source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/>
- <source>Stop Copying Session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/>
- <source>Stop the interrupted copying session</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/>
- <source>Abort Copying Session</source>
+ <source>Stop Copying Session</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/>
+ <source>Stop the interrupted copying session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/>
+ <source>Abort Copying Session</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/>
<source>Abort the interrupted copying session and rollback</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/>
+ <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/>
+ <source>Merge Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/>
+ <source>Copy Changesets (Stop)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/>
+ <source>Copy Changesets (Abort)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/>
- <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/>
- <source>Merge Changesets</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/>
- <source>Copy Changesets (Stop)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/>
- <source>Copy Changesets (Abort)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/>
<source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
+ <source>Commit Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
+ <source>Commit a merge.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
+ <source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
+ <source>Abort Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/>
+ <source>Abort an uncommitted merge and lose all changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/>
+ <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -47489,202 +47504,202 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="854"/>
<source>Serial Device Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="853"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="854"/>
<source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="899"/>
<source>Run Script</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="881"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="882"/>
<source>There is no editor open. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="889"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="890"/>
<source>The current editor does not contain a script. Abort...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="898"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="899"/>
<source><p>Cannot run script.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="922"/>
<source>Open Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="921"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="922"/>
<source>Python3 Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="966"/>
<source>Start Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="965"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="966"/>
<source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="995"/>
<source>Unsaved Chart Data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="994"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="995"/>
<source>The chart contains unsaved data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/>
<source>Start File Manager</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/>
<source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/>
<source>Show Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/>
<source>Show Implementation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
<source>Synchronize Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/>
<source>Show Device Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/>
<source>Show Local Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/>
<source>Compile Python File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/>
<source>Compile Current Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/>
<source><h3>Device Version Information</h3></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/>
<source>No version information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/>
<source>Device Version Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/>
<source>Device Implementation Information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/>
<source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/>
<source><p>The time of the connected device was synchronized with the local time.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/>
<source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/>
<source><h3>Device Date and Time</h3><p>{0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/>
<source>Device Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
<source>Local Date and Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/>
<source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/>
<source>Error handling device</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/>
<source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/>
<source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/>
<source>The Python file <b>{0}</b> does not exist. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/>
<source>'mpy-cross' Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/>
<source>The current editor does not contain a Python file. Aborting...</source>
<translation type="unfinished"></translation>
</message>
@@ -47699,12 +47714,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="978"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="979"/>
<source>µPy Chart</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/>
+ <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/>
<source>µPy Files</source>
<translation type="unfinished"></translation>
</message>
@@ -77950,7 +77965,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3724"/>
+ <location filename="../UI/UserInterface.py" line="3731"/>
<source>Report Bug</source>
<translation type="unfinished"></translation>
</message>
@@ -77990,7 +78005,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3278"/>
+ <location filename="../UI/UserInterface.py" line="3285"/>
<source>Unittest</source>
<translation type="unfinished"></translation>
</message>
@@ -78335,7 +78350,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6313"/>
+ <location filename="../UI/UserInterface.py" line="6320"/>
<source>Export Keyboard Shortcuts</source>
<translation type="unfinished"></translation>
</message>
@@ -78355,7 +78370,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6337"/>
+ <location filename="../UI/UserInterface.py" line="6344"/>
<source>Import Keyboard Shortcuts</source>
<translation type="unfinished"></translation>
</message>
@@ -78570,7 +78585,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3189"/>
+ <location filename="../UI/UserInterface.py" line="3196"/>
<source>&Toolbars</source>
<translation type="unfinished"></translation>
</message>
@@ -78585,329 +78600,329 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3202"/>
+ <location filename="../UI/UserInterface.py" line="3209"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3277"/>
+ <location filename="../UI/UserInterface.py" line="3284"/>
<source>Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3279"/>
+ <location filename="../UI/UserInterface.py" line="3286"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5111"/>
+ <location filename="../UI/UserInterface.py" line="5118"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3281"/>
+ <location filename="../UI/UserInterface.py" line="3288"/>
<source>Profiles</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3282"/>
+ <location filename="../UI/UserInterface.py" line="3289"/>
<source>Plugins</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3447"/>
- <source><p>This part of the status bar displays the current editors language.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../UI/UserInterface.py" line="3454"/>
- <source><p>This part of the status bar displays the current editors encoding.</p></source>
+ <source><p>This part of the status bar displays the current editors language.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UI/UserInterface.py" line="3461"/>
- <source><p>This part of the status bar displays the current editors eol setting.</p></source>
+ <source><p>This part of the status bar displays the current editors encoding.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UI/UserInterface.py" line="3468"/>
- <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source>
+ <source><p>This part of the status bar displays the current editors eol setting.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UI/UserInterface.py" line="3475"/>
- <source><p>This part of the status bar displays the line number of the current editor.</p></source>
+ <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../UI/UserInterface.py" line="3482"/>
+ <source><p>This part of the status bar displays the line number of the current editor.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="3489"/>
<source><p>This part of the status bar displays the cursor position of the current editor.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3558"/>
+ <location filename="../UI/UserInterface.py" line="3565"/>
<source>External Tools/{0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3664"/>
+ <location filename="../UI/UserInterface.py" line="3671"/>
<source><h3>Version Numbers</h3><table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7302"/>
+ <location filename="../UI/UserInterface.py" line="7309"/>
<source></table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3724"/>
+ <location filename="../UI/UserInterface.py" line="3731"/>
<source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4009"/>
+ <location filename="../UI/UserInterface.py" line="4016"/>
<source>Restart application</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4009"/>
+ <location filename="../UI/UserInterface.py" line="4016"/>
<source>The application needs to be restarted. Do it now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4090"/>
+ <location filename="../UI/UserInterface.py" line="4097"/>
<source>Configure Tool Groups ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4094"/>
+ <location filename="../UI/UserInterface.py" line="4101"/>
<source>Configure current Tool Group ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4045"/>
+ <location filename="../UI/UserInterface.py" line="4052"/>
<source>&Builtin Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4062"/>
+ <location filename="../UI/UserInterface.py" line="4069"/>
<source>&Plugin Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4210"/>
+ <location filename="../UI/UserInterface.py" line="4217"/>
<source>&Show all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4212"/>
+ <location filename="../UI/UserInterface.py" line="4219"/>
<source>&Hide all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5058"/>
+ <location filename="../UI/UserInterface.py" line="5065"/>
<source>Qt 3 support</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5237"/>
+ <location filename="../UI/UserInterface.py" line="5244"/>
<source>Problem</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5237"/>
+ <location filename="../UI/UserInterface.py" line="5244"/>
<source><p>The file <b>{0}</b> does not exist or is zero length.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5426"/>
+ <location filename="../UI/UserInterface.py" line="5433"/>
<source>Process Generation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4961"/>
+ <location filename="../UI/UserInterface.py" line="4968"/>
<source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5030"/>
+ <location filename="../UI/UserInterface.py" line="5037"/>
<source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5083"/>
+ <location filename="../UI/UserInterface.py" line="5090"/>
<source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5111"/>
+ <location filename="../UI/UserInterface.py" line="5118"/>
<source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5125"/>
+ <location filename="../UI/UserInterface.py" line="5132"/>
<source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5145"/>
+ <location filename="../UI/UserInterface.py" line="5152"/>
<source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5193"/>
+ <location filename="../UI/UserInterface.py" line="5200"/>
<source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5248"/>
+ <location filename="../UI/UserInterface.py" line="5255"/>
<source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5269"/>
+ <location filename="../UI/UserInterface.py" line="5276"/>
<source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5371"/>
+ <location filename="../UI/UserInterface.py" line="5378"/>
<source>External Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5362"/>
+ <location filename="../UI/UserInterface.py" line="5369"/>
<source>No tool entry found for external tool '{0}' in tool group '{1}'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5371"/>
+ <location filename="../UI/UserInterface.py" line="5378"/>
<source>No toolgroup entry '{0}' found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5410"/>
+ <location filename="../UI/UserInterface.py" line="5417"/>
<source>Starting process '{0} {1}'.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5426"/>
+ <location filename="../UI/UserInterface.py" line="5433"/>
<source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5502"/>
+ <location filename="../UI/UserInterface.py" line="5509"/>
<source>Process '{0}' has exited.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5901"/>
+ <location filename="../UI/UserInterface.py" line="5908"/>
<source>Documentation Missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5901"/>
+ <location filename="../UI/UserInterface.py" line="5908"/>
<source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5884"/>
+ <location filename="../UI/UserInterface.py" line="5891"/>
<source>Documentation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5709"/>
+ <location filename="../UI/UserInterface.py" line="5716"/>
<source><p>The PyQt4 documentation starting point has not been configured.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6337"/>
+ <location filename="../UI/UserInterface.py" line="6344"/>
<source>Keyboard shortcut file (*.e4k)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6506"/>
+ <location filename="../UI/UserInterface.py" line="6513"/>
<source>Save tasks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6506"/>
+ <location filename="../UI/UserInterface.py" line="6513"/>
<source><p>The tasks file <b>{0}</b> could not be written.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6535"/>
+ <location filename="../UI/UserInterface.py" line="6542"/>
<source>Read tasks</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6535"/>
+ <location filename="../UI/UserInterface.py" line="6542"/>
<source><p>The tasks file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6631"/>
+ <location filename="../UI/UserInterface.py" line="6638"/>
<source>Save session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6569"/>
+ <location filename="../UI/UserInterface.py" line="6576"/>
<source><p>The session file <b>{0}</b> could not be written.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6615"/>
+ <location filename="../UI/UserInterface.py" line="6622"/>
<source>Read session</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6615"/>
+ <location filename="../UI/UserInterface.py" line="6622"/>
<source><p>The session file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6895"/>
+ <location filename="../UI/UserInterface.py" line="6902"/>
<source>Drop Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6895"/>
+ <location filename="../UI/UserInterface.py" line="6902"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7080"/>
+ <location filename="../UI/UserInterface.py" line="7087"/>
<source>&Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7089"/>
+ <location filename="../UI/UserInterface.py" line="7096"/>
<source>Trying host {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7245"/>
+ <location filename="../UI/UserInterface.py" line="7252"/>
<source>Update available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7264"/>
+ <location filename="../UI/UserInterface.py" line="7271"/>
<source>Error during updates check</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7264"/>
+ <location filename="../UI/UserInterface.py" line="7271"/>
<source>Could not perform updates check.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7288"/>
+ <location filename="../UI/UserInterface.py" line="7295"/>
<source><h3>Available versions</h3><table></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7339"/>
+ <location filename="../UI/UserInterface.py" line="7346"/>
<source>First time usage</source>
<translation type="unfinished"></translation>
</message>
@@ -78947,27 +78962,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7153"/>
+ <location filename="../UI/UserInterface.py" line="7160"/>
<source>Error getting versions information</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7146"/>
- <source>The versions information could not be downloaded. Please go online and try again.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../UI/UserInterface.py" line="6103"/>
- <source>Open Browser</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../UI/UserInterface.py" line="6103"/>
- <source>Could not start a web browser</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../UI/UserInterface.py" line="7153"/>
+ <source>The versions information could not be downloaded. Please go online and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="6110"/>
+ <source>Open Browser</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="6110"/>
+ <source>Could not start a web browser</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="7160"/>
<source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -79053,12 +79068,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5339"/>
+ <location filename="../UI/UserInterface.py" line="5346"/>
<source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7358"/>
+ <location filename="../UI/UserInterface.py" line="7365"/>
<source>Select Workspace Directory</source>
<translation type="unfinished"></translation>
</message>
@@ -79423,7 +79438,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5771"/>
+ <location filename="../UI/UserInterface.py" line="5778"/>
<source><p>The PyQt5 documentation starting point has not been configured.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -79433,7 +79448,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7080"/>
+ <location filename="../UI/UserInterface.py" line="7087"/>
<source>%v/%m</source>
<translation type="unfinished"></translation>
</message>
@@ -79453,7 +79468,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7084"/>
+ <location filename="../UI/UserInterface.py" line="7091"/>
<source>Version Check</source>
<translation type="unfinished"></translation>
</message>
@@ -79523,27 +79538,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5058"/>
+ <location filename="../UI/UserInterface.py" line="5065"/>
<source>Qt v.3 is not supported by eric6.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7245"/>
+ <location filename="../UI/UserInterface.py" line="7252"/>
<source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7257"/>
+ <location filename="../UI/UserInterface.py" line="7264"/>
<source>Eric6 is up to date</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7257"/>
+ <location filename="../UI/UserInterface.py" line="7264"/>
<source>You are using the latest version of eric6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7339"/>
+ <location filename="../UI/UserInterface.py" line="7346"/>
<source>eric6 has not been configured yet. The configuration dialog will be started.</source>
<translation type="unfinished"></translation>
</message>
@@ -79553,17 +79568,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4065"/>
+ <location filename="../UI/UserInterface.py" line="4072"/>
<source>&User Tools</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="4137"/>
+ <location filename="../UI/UserInterface.py" line="4144"/>
<source>No User Tools Configured</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7100"/>
+ <location filename="../UI/UserInterface.py" line="7107"/>
<source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -79608,7 +79623,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6653"/>
+ <location filename="../UI/UserInterface.py" line="6660"/>
<source>Load session</source>
<translation type="unfinished"></translation>
</message>
@@ -79623,17 +79638,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6653"/>
+ <location filename="../UI/UserInterface.py" line="6660"/>
<source>eric6 Session Files (*.e5s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6700"/>
+ <location filename="../UI/UserInterface.py" line="6707"/>
<source>Crash Session found!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6700"/>
+ <location filename="../UI/UserInterface.py" line="6707"/>
<source>A session file of a crashed session was found. Shall this session be restored?</source>
<translation type="unfinished"></translation>
</message>
@@ -79648,17 +79663,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7233"/>
+ <location filename="../UI/UserInterface.py" line="7240"/>
<source>Update Check</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7233"/>
+ <location filename="../UI/UserInterface.py" line="7240"/>
<source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="7223"/>
+ <location filename="../UI/UserInterface.py" line="7230"/>
<source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source>
<translation type="unfinished"></translation>
</message>
@@ -79713,7 +79728,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="5884"/>
+ <location filename="../UI/UserInterface.py" line="5891"/>
<source><p>The PySide{0} documentation starting point has not been configured.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -79748,22 +79763,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3128"/>
+ <location filename="../UI/UserInterface.py" line="3135"/>
<source>Left Side</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3144"/>
+ <location filename="../UI/UserInterface.py" line="3151"/>
<source>Bottom Side</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3155"/>
+ <location filename="../UI/UserInterface.py" line="3162"/>
<source>Right Side</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3179"/>
+ <location filename="../UI/UserInterface.py" line="3186"/>
<source>Plug-ins</source>
<translation type="unfinished"></translation>
</message>
@@ -79789,17 +79804,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6058"/>
+ <location filename="../UI/UserInterface.py" line="6065"/>
<source>Start Web Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6000"/>
+ <location filename="../UI/UserInterface.py" line="6007"/>
<source>The eric6 web browser could not be started.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="6058"/>
+ <location filename="../UI/UserInterface.py" line="6065"/>
<source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -79814,7 +79829,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/UserInterface.py" line="3493"/>
+ <location filename="../UI/UserInterface.py" line="3500"/>
<source><p>This part of the status bar allows zooming the current editor or shell.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -79888,6 +79903,11 @@
<source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../UI/UserInterface.py" line="3128"/>
+ <source>Central Park</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UserPropertiesDialog</name>
@@ -89758,46 +89778,46 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/>
<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="2056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/>
<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="2066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/>
<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="1436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/>
<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="2048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/>
<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="2051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/>
<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="2071"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/>
<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="2075"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/>
<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>
@@ -89805,12 +89825,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -89821,13 +89841,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/>
<source><tr><td><b>Head #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
