--- a/i18n/eric5_en.ts Thu Aug 01 19:12:57 2013 +0200 +++ b/i18n/eric5_en.ts Fri Aug 02 16:29:25 2013 +0200 @@ -17862,7 +17862,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1675"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -17917,172 +17917,172 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="888"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="939"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1248"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1821"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1993"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2014"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2023"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2025"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2163"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2186"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <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="2338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2340"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2297"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> <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="2394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2431"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2439"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2590"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2570"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2572"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18092,72 +18092,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3049"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051"/> <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="3178"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3180"/> <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="2684"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2732"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2861"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> <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="2956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2958"/> <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="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <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="3020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -18172,37 +18172,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="927"/> <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="933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="934"/> <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="2895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1744"/> <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"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1677"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -20050,7 +20050,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="58"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> @@ -20090,17 +20090,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1226"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1223"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -20200,122 +20200,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="393"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="409"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="440"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="457"/> - <source>Select to switch the input field to password mode</source> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> + <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="467"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="470"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="463"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="473"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="503"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="512"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="704"/> <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/HgLogBrowserDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="131"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <source>Press to refresh the list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> - <source>Press to refresh the list of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> @@ -20346,15 +20346,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="385"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -20374,166 +20384,176 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="51"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="61"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="67"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="83"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="105"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="98"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="101"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="108"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="115"/> - <source>Select to switch the input field to password mode</source> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="111"/> + <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="118"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="125"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="128"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="131"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="188"/> <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/HgLogDialog.py" line="236"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> - <source>Could not start the hg executable.</source> + <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="242"/> + <source>Could not start the hg executable.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="245"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="306"/> <source>diff to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> <source>Branches: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> <source>Tags: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="324"/> <source>Parents: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="329"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="339"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="355"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="45"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui" line="48"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -20920,7 +20940,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="649"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> @@ -20980,12 +21000,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <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="647"/> + <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> @@ -59355,46 +59375,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1308"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1309"/> <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="1941"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943"/> <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="1949"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1951"/> <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="1324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1325"/> <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="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="1937"/> + <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="1939"/> <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="1953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> <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="1956"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1958"/> <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> @@ -59402,12 +59422,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1947"/> <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="1358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>