--- a/i18n/eric5_en.ts Fri May 27 18:22:07 2011 +0200
+++ b/i18n/eric5_en.ts Fri May 27 19:10:22 2011 +0200
@@ -15023,247 +15023,247 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/>
<source>The hg process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/>
<source>Commiting changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/>
<source>Taging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/>
<source>Mercurial Log</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/>
<source>Select number of entries to show.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/>
<source>Resolving files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/>
<source>Enter branch name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/>
<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="1913"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/>
<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="1965"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/>
<source>Identifying changegroup file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/>
- <source>Apply changegroups</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/>
- <source>Shall the working directory be updated?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
+ <source>Apply changegroups</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/>
+ <source>Shall the working directory be updated?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -17668,352 +17668,312 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit repository config</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit repository config...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/>
- <source>Show an editor to edit the repository config file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
- <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Show combined config settings</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Show combined config settings...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/>
- <source>Show the combined config settings from all config files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/>
- <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
<source>Show paths</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
<source>Show paths...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/>
<source>Show the aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
<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="600"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
<source>Verify repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
<source>Verify repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
<source>Verify the integrity of the repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/>
<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="613"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Recover</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Recover...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
<source>Recover from an interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/>
<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="626"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
<source>Identify</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
<source>Identify...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
<source>Identify the project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
<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="639"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
<source>Create .hgignore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/>
<source>Create a .hgignore file with default values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/>
<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="652"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
<source>Create changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
<source>Create changegroup file collecting changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
<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="666"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
<source>Preview changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
<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="672"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/>
<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="680"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
<source>Identify changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
<source>Identify changegroup...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
<source>Identify a changegroup file containing a collection of changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/>
<source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
<source>Apply changegroups...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
<source>Apply one or several changegroup 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="715"/>
<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="708"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
<source>Mark as "good"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
<source>Mark as "good"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
<source>Mark a selectable changeset as good</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
<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="721"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
<source>Mark as "bad"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
<source>Mark as "bad"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Mark a selectable changeset as bad</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<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="734"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
<source>Skip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/>
<source>Skip the current changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
<source><b>Skip</b><p>This skips the current changeset.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
<source>Reset the bisect search data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<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="760"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
<source>Back out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
<source>Back out changes of an earlier changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
<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="798"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
<source>Serve project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
<source>Serve project repository...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
<source>Serve the project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/>
- <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="819"/>
+ <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="834"/>
<source>Repository Administration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/>
<source>Specials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/>
<source>Changegroup Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/>
<source>Bisect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/>
<source>Pull</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -18033,25 +17993,85 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/>
<source>Rollback the last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
<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="857"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
+ <source>Edit user configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
+ <source>Edit user configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/>
+ <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="567"/>
+ <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="574"/>
+ <source>Edit repository configuration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
+ <source>Edit repository configuration...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/>
+ <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="580"/>
+ <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="587"/>
+ <source>Show combined configuration settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
+ <source>Show combined configuration settings...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/>
+ <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="594"/>
+ <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>
</context>
<context>
<name>HgQueuesDefineGuardsDialog</name>
@@ -22507,12 +22527,12 @@
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/>
- <source>Edit the mercurial config file</source>
+ <source>Edit the Mercurial configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/>
- <source>Edit config file</source>
+ <source>Edit configuration file</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -46817,30 +46837,30 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/>
<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="1550"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/>
<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="1558"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/>
<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="1094"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/>
<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="1118"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -46851,23 +46871,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/>
<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="1546"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/>
<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="1562"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/>
<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="1565"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/>
<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>
@@ -46875,7 +46895,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
