--- a/i18n/eric5_en.ts Wed Jul 31 20:07:41 2013 +0200 +++ b/i18n/eric5_en.ts Thu Aug 01 18:41:16 2013 +0200 @@ -17857,350 +17857,355 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> <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="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="235"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="261"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="289"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="306"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="352"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="560"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="612"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="676"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="738"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="741"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="884"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="989"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> <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="2265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2338"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> <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="2321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2394"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2517"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2542"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2537"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> <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="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="508"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2976"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> <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="3105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> <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="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <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="2883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2956"/> <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="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <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="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <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="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="439"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="442"/> <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="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> <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="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <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="2822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2895"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <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="1676"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -20085,12 +20090,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> <source>Author</source> <translation type="unfinished"></translation> </message> @@ -20341,12 +20346,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -20895,115 +20900,120 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="473"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Show difference (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="245"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> - <source>Show difference (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="239"/> - <source>Show annotated file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Select all local file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="500"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="623"/> - <source>Do you really want to remove these translation files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="495"/> - <source>Conflict resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> <source>Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="241"/> + <source>Show difference side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -59320,46 +59330,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> <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="1868"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <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="1876"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1949"/> <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="1321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1324"/> <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="1862"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1935"/> <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="1864"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> <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="1880"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> <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="1883"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <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> @@ -59367,12 +59377,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <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="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1358"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>