--- a/i18n/eric6_en.ts Wed Nov 16 20:03:45 2016 +0100
+++ b/i18n/eric6_en.ts Thu Nov 17 18:59:13 2016 +0100
@@ -21295,7 +21295,7 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1853"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
@@ -21325,242 +21325,242 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="640"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
+ <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="813"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="822"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1043"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1088"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1390"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1610"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2011"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2302"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2421"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2461"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2518"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/>
<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="2638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2621"/>
<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="2659"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2708"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2719"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2776"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2808"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2842"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2880"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2873"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2882"/>
<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="553"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3535"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3390"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3399"/>
<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="3535"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
<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="2948"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3104"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3130"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3301"/>
<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="3240"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/>
<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="3311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320"/>
<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="3311"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
@@ -21575,157 +21575,157 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1037"/>
<source>Revert changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
- <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="1028"/>
+ <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="1037"/>
<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="3156"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3165"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/>
<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="1847"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/>
<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="978"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="987"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1164"/>
<source>Current branch tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/>
<source>Cancelling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3654"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/>
<source>Delete Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3676"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3685"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3696"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3720"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3729"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3762"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3866"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3866"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3869"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3878"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3910"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3901"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3910"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3913"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3922"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1134"/>
+ <source>Re-Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
- <source>Re-Merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
<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="1125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1134"/>
<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="1130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1139"/>
<source>Re-Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/>
<source>Marking as 'unresolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3182"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3182"/>
<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>
@@ -22844,6 +22844,41 @@
<source>Commit sub-repositories</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="80"/>
+ <source>Author</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="86"/>
+ <source>Enter author name to override the configured user:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="96"/>
+ <source>Enter an author name in order to override the configured one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="109"/>
+ <source>Select to give date and time information</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="112"/>
+ <source>Date and Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="137"/>
+ <source>Date/Time:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.ui" line="144"/>
+ <source>Enter the date and time to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgConflictsListDialog</name>
@@ -35002,109 +35037,109 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="180"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="216"/>
<source>Incoming / Outgoing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="186"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/>
<source>Select to show the incoming and outgoing log in a log browser dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="225"/>
<source>Use Log Browser for incoming / outgoing log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="235"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="205"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/>
<source>Select to update the working directory to new tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="244"/>
<source>Update after pulling</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="333"/>
+ <source>Edit the Mercurial configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="336"/>
+ <source>Edit configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="310"/>
+ <source>Cleanup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="316"/>
+ <source>Pattern:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="323"/>
+ <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="251"/>
+ <source>Select to prefer unbundle over pull</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="254"/>
+ <source><b>Prefer Unbundle</b>
+<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="258"/>
+ <source>Prefer Unbundle</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="291"/>
+ <source>Revert</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/>
- <source>Edit the Mercurial configuration file</source>
+ <source>Select to create a backup file (.orig) before reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/>
- <source>Edit configuration file</source>
+ <source>Create Backup Files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="268"/>
+ <source>Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/>
- <source>Cleanup</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="280"/>
- <source>Pattern:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="287"/>
- <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="215"/>
- <source>Select to prefer unbundle over pull</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/>
- <source><b>Prefer Unbundle</b>
-<p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/>
- <source>Prefer Unbundle</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/>
- <source>Revert</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/>
- <source>Select to create a backup file (.orig) before reverting changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/>
- <source>Create Backup Files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="232"/>
- <source>Merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="238"/>
<source>Select to enforce usage of the Mercural internal merge tool</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="277"/>
<source><b>Internal Merge Tool</b>
<p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="281"/>
<source>Use internal merge with conflict markers</source>
<translation type="unfinished"></translation>
</message>
@@ -35138,6 +35173,16 @@
<source>Consider hidden changesets</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="177"/>
+ <source>No. of commit authors to remember:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="184"/>
+ <source>Enter the number of commit authors to remember</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageBoxWizard</name>
@@ -70627,46 +70672,46 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/>
<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="2130"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/>
<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="2140"/>
- <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="1468"/>
- <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="2122"/>
- <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="2125"/>
- <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="2145"/>
- <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="2149"/>
+ <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="1477"/>
+ <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="2131"/>
+ <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="2134"/>
+ <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="2154"/>
+ <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="2158"/>
<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>
@@ -70674,12 +70719,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
<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="1506"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1515"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -70690,13 +70735,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/>
<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="2117"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
