Mercurial > hg > easyhg
diff easyhg_en.ts @ 168:4bad3c5c053a
* Add "Show summary" feature
* Add simplistic kinetic scrolling to history widget
author | Chris Cannam |
---|---|
date | Tue, 14 Dec 2010 17:20:10 +0000 |
parents | edab92f3ea0b |
children | bf366e0b9050 |
line wrap: on
line diff
--- a/easyhg_en.ts Wed Dec 08 16:57:18 2010 +0000 +++ b/easyhg_en.ts Tue Dec 14 17:20:10 2010 +0000 @@ -4,42 +4,42 @@ <context> <name>ChangesetItem</name> <message> - <location filename="changesetitem.cpp" line="111"/> - <source><qt>&nbsp;<b>Revision: </b>%1</qt></source> + <location filename="changesetitem.cpp" line="112"/> + <source><qt><b>&nbsp;Revision: </b>%1</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="118"/> + <location filename="changesetitem.cpp" line="119"/> <source>Copy identifier to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="127"/> + <location filename="changesetitem.cpp" line="128"/> <source>Diff to parent %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="136"/> + <location filename="changesetitem.cpp" line="138"/> <source>Diff to parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="141"/> + <location filename="changesetitem.cpp" line="143"/> <source>Diff to current working folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="146"/> + <location filename="changesetitem.cpp" line="148"/> <source>Update to this revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="149"/> + <location filename="changesetitem.cpp" line="151"/> <source>Merge from here to current</source> <translation type="unfinished"></translation> </message> <message> - <location filename="changesetitem.cpp" line="154"/> + <location filename="changesetitem.cpp" line="156"/> <source>Add tag...</source> <translation type="unfinished"></translation> </message> @@ -71,7 +71,8 @@ </message> <message> <location filename="filestatuswidget.cpp" line="65"/> - <source>You have made no changes.</source> + <source>You have no uncommitted changes.</source> + <oldsource>You have made no changes.</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -101,41 +102,51 @@ </message> <message> <location filename="filestatuswidget.cpp" line="73"/> + <source>In Conflict:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="filestatuswidget.cpp" line="74"/> <source>Untracked:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="75"/> + <location filename="filestatuswidget.cpp" line="76"/> <source>You have not changed these files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="76"/> + <location filename="filestatuswidget.cpp" line="77"/> <source>You have changed these files since you last committed them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="77"/> + <location filename="filestatuswidget.cpp" line="78"/> <source>These files will be added to version control next time you commit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="78"/> + <location filename="filestatuswidget.cpp" line="79"/> <source>These files will be removed from version control next time you commit.<br>They will not be deleted from the local folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="80"/> + <location filename="filestatuswidget.cpp" line="81"/> <source>These files are recorded in the version control, but absent from your working folder.<br>If you intended to delete them, select them and use Remove to tell the version control system about it.<br>If you deleted them by accident, select them and use Revert to restore their previous contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="83"/> + <location filename="filestatuswidget.cpp" line="84"/> + <source>These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="filestatuswidget.cpp" line="85"/> <source>These files are in your working folder but are not under version control.<br>Select a file and use Add to place it under version control or Ignore to remove it from this list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="filestatuswidget.cpp" line="86"/> + <location filename="filestatuswidget.cpp" line="88"/> <source>Files highlighted <font color=#d40000>in red</font> have appeared since your most recent commit or update.</source> <translation type="unfinished"></translation> </message> @@ -143,37 +154,37 @@ <context> <name>HgRunner</name> <message> - <location filename="hgrunner.cpp" line="119"/> + <location filename="hgrunner.cpp" line="143"/> <source>User name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="121"/> + <location filename="hgrunner.cpp" line="145"/> <source>User name for "%1":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="125"/> + <location filename="hgrunner.cpp" line="149"/> <source>Enter user name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="146"/> + <location filename="hgrunner.cpp" line="170"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="149"/> + <location filename="hgrunner.cpp" line="173"/> <source>Password for "%1" at "%2":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="152"/> + <location filename="hgrunner.cpp" line="176"/> <source>Password for user "%1":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="hgrunner.cpp" line="158"/> + <location filename="hgrunner.cpp" line="182"/> <source>Enter password</source> <translation type="unfinished"></translation> </message> @@ -215,69 +226,61 @@ <context> <name>MainWindow</name> <message> - <location filename="mainwindow.cpp" line="63"/> - <location filename="mainwindow.cpp" line="1045"/> + <location filename="mainwindow.cpp" line="64"/> + <location filename="mainwindow.cpp" line="1133"/> <source>EasyMercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="130"/> + <location filename="mainwindow.cpp" line="132"/> <source>About EasyMercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="131"/> + <location filename="mainwindow.cpp" line="133"/> <source><qt><h2>About EasyMercurial</h2><p>EasyMercurial is a simple user interface for the Mercurial version control system.</p><p>EasyMercurial is based on hgExplorer by Jari Korhonen, with thanks.<br>EasyMercurial development carried out by Chris Cannam for soundsoftware.ac.uk at the Centre for Digital Music, Queen Mary, University of London.<ul><li>Copyright &copy; 2010 Jari Korhonen</li><li>Copyright &copy; 2010 Chris Cannam</li><li>Copyright &copy; 2010 Queen Mary, University of London</li></ul><p> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="321"/> + <location filename="mainwindow.cpp" line="300"/> <source>Commit files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="370"/> + <location filename="mainwindow.cpp" line="351"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="371"/> + <location filename="mainwindow.cpp" line="352"/> <source>Enter tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="526"/> + <location filename="mainwindow.cpp" line="528"/> <source>Revert files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="326"/> - <location filename="mainwindow.cpp" line="328"/> - <location filename="mainwindow.cpp" line="531"/> + <location filename="mainwindow.cpp" line="305"/> + <location filename="mainwindow.cpp" line="307"/> <location filename="mainwindow.cpp" line="533"/> + <location filename="mainwindow.cpp" line="535"/> <source><h3>%1</h3><p>%2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="327"/> + <location filename="mainwindow.cpp" line="306"/> <source>You are about to commit the following files:</source> <translation type="unfinished"></translation> </message> - <message numerus="yes"> - <location filename="mainwindow.cpp" line="329"/> - <source>You are about to commit %n file(s):</source> - <translation type="unfinished"> - <numerusform>You are about to commit %n file:</numerusform> - <numerusform>You are about to commit %n files:</numerusform> - </translation> - </message> <message> - <location filename="mainwindow.cpp" line="532"/> + <location filename="mainwindow.cpp" line="534"/> <source>You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="mainwindow.cpp" line="534"/> + <location filename="mainwindow.cpp" line="536"/> <source>You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</source> <oldsource>You are about to <b>revert</b> %n files.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</oldsource> <translation type="unfinished"> @@ -286,185 +289,200 @@ </translation> </message> <message> - <location filename="mainwindow.cpp" line="621"/> + <location filename="mainwindow.cpp" line="648"/> + <source>Merge from the default branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="650"/> + <source>Merge from branch "%1"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="656"/> + <source>Merge from %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="705"/> <source>Confirm pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="622"/> + <location filename="mainwindow.cpp" line="706"/> <source>Confirm pull from remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="623"/> + <location filename="mainwindow.cpp" line="707"/> <source>You are about to pull from the following remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="636"/> + <location filename="mainwindow.cpp" line="720"/> <source>Confirm push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="637"/> + <location filename="mainwindow.cpp" line="721"/> <source>Confirm push to remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="638"/> + <location filename="mainwindow.cpp" line="722"/> <source>You are about to push to the following remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="714"/> + <location filename="mainwindow.cpp" line="802"/> <source>Open Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="715"/> + <location filename="mainwindow.cpp" line="803"/> <source><qt><big>What would you like to open?</big></qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="719"/> + <location filename="mainwindow.cpp" line="807"/> <source><qt><center><img src=":images/browser-64.png"><br>Remote repository</center></qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="720"/> + <location filename="mainwindow.cpp" line="808"/> <source>Open a remote Mercurial repository, by cloning from its URL into a local folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="724"/> + <location filename="mainwindow.cpp" line="812"/> <source><qt><center><img src=":images/hglogo-64.png"><br>Local repository</center></qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="725"/> + <location filename="mainwindow.cpp" line="813"/> <source>Open an existing local Mercurial repository.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="729"/> + <location filename="mainwindow.cpp" line="817"/> <source><qt><center><img src=":images/hdd_unmount-64.png"><br>File folder</center></qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="730"/> + <location filename="mainwindow.cpp" line="818"/> <source>Open a local folder, by creating a Mercurial repository in it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="779"/> + <location filename="mainwindow.cpp" line="867"/> <source>File chosen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="780"/> + <location filename="mainwindow.cpp" line="868"/> <source><qt><b>Folder required</b><br><br>You asked to open "%1".<br>This is a file; to open a repository, you need to choose a folder.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="787"/> - <location filename="mainwindow.cpp" line="857"/> + <location filename="mainwindow.cpp" line="875"/> + <location filename="mainwindow.cpp" line="945"/> <source>Folder does not exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="788"/> + <location filename="mainwindow.cpp" line="876"/> <source><qt><b>Folder does not exist</b><br><br>You asked to open "%1".<br>This folder does not exist, and it cannot be created because its parent does not exist either.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="795"/> - <location filename="mainwindow.cpp" line="811"/> + <location filename="mainwindow.cpp" line="883"/> + <location filename="mainwindow.cpp" line="899"/> <source>Path is in existing repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="796"/> + <location filename="mainwindow.cpp" line="884"/> <source><qt><b>Path is in an existing repository</b><br><br>You asked to initialise a repository at "%1".<br>This path is already inside an existing repository.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="803"/> - <location filename="mainwindow.cpp" line="819"/> + <location filename="mainwindow.cpp" line="891"/> + <location filename="mainwindow.cpp" line="907"/> <source>Path is a file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="804"/> + <location filename="mainwindow.cpp" line="892"/> <source><qt><b>Path is a file</b><br><br>You asked to initialise a repository at "%1".<br>This is an existing file; it is only possible to initialise in folders.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="812"/> + <location filename="mainwindow.cpp" line="900"/> <source><qt><b>Local path is in an existing repository</b><br><br>You asked to open a remote repository by cloning it to the local path "%1".<br>This path is already inside an existing repository.<br>Please provide a new folder name for the local repository.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="820"/> + <location filename="mainwindow.cpp" line="908"/> <source><qt><b>Local path is a file</b><br><br>You asked to open a remote repository by cloning it to the local path "%1".<br>This path is an existing file.<br>Please provide a new folder name for the local repository.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="827"/> + <location filename="mainwindow.cpp" line="915"/> <source>Folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="828"/> + <location filename="mainwindow.cpp" line="916"/> <source><qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to the local path "%1".<br>This is the path of an existing folder.<br>Please provide a new folder name for the local repository.</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="835"/> + <location filename="mainwindow.cpp" line="923"/> <source>Path is inside a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="836"/> + <location filename="mainwindow.cpp" line="924"/> <source><qt><b>Open the repository that contains this path?</b><br><br>You asked to open "%1".<br>This is not the root folder of a repository.<br>But it is inside a repository, whose root is at "%2". <br><br>Would you like to open that repository instead?</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="846"/> + <location filename="mainwindow.cpp" line="934"/> <source>Folder has no repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="847"/> + <location filename="mainwindow.cpp" line="935"/> <source><qt><b>Initialise a repository here?</b><br><br>You asked to open "%1".<br>This folder does not contain a Mercurial repository.<br><br>Would you like to initialise a repository here?</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="858"/> + <location filename="mainwindow.cpp" line="946"/> <source><qt><b>Initialise a new repository?</b><br><br>You asked to open "%1".<br>This folder does not yet exist.<br><br>Would you like to create the folder and initialise a new empty repository in it?</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="868"/> + <location filename="mainwindow.cpp" line="956"/> <source>Repository exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="869"/> + <location filename="mainwindow.cpp" line="957"/> <source><qt><b>Open existing repository?</b><br><br>You asked to initialise a new repository at "%1".<br>This folder already contains a repository. Would you like to open it?</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1034"/> + <location filename="mainwindow.cpp" line="1122"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1045"/> + <location filename="mainwindow.cpp" line="1133"/> <source>Mercurial command did not return any output.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="mainwindow.cpp" line="1127"/> + <location filename="mainwindow.cpp" line="1216"/> <source>Pushed %n changeset(s)</source> <translation type="unfinished"> <numerusform>Pushed %n changeset</numerusform> @@ -472,22 +490,22 @@ </translation> </message> <message> - <location filename="mainwindow.cpp" line="1129"/> + <location filename="mainwindow.cpp" line="1218"/> <source>No changes to push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1131"/> + <location filename="mainwindow.cpp" line="1220"/> <source>Push complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1133"/> + <location filename="mainwindow.cpp" line="1222"/> <source>The push command output was:</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="mainwindow.cpp" line="1143"/> + <location filename="mainwindow.cpp" line="1232"/> <source>Pulled %n changeset(s)</source> <translation type="unfinished"> <numerusform>Pulled %n changeset</numerusform> @@ -495,361 +513,383 @@ </translation> </message> <message> - <location filename="mainwindow.cpp" line="1145"/> + <location filename="mainwindow.cpp" line="1234"/> <source>No changes to pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1147"/> + <location filename="mainwindow.cpp" line="1236"/> <source>Pull complete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1149"/> + <location filename="mainwindow.cpp" line="1238"/> <source>The pull command output was:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1190"/> + <location filename="mainwindow.cpp" line="1285"/> <source><qt><h3>Command failed</h3><p>The following command failed:</p><code>%1</code>%2</qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1196"/> + <location filename="mainwindow.cpp" line="1291"/> <source><p>Its output said:</p><code>%1</code></source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1201"/> + <location filename="mainwindow.cpp" line="1296"/> <source>Command failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1351"/> - <location filename="mainwindow.cpp" line="1694"/> + <location filename="mainwindow.cpp" line="1445"/> + <source>Change summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1446"/> + <source>Summary of uncommitted changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1459"/> + <location filename="mainwindow.cpp" line="1464"/> + <location filename="mainwindow.cpp" line="1831"/> <source>Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1356"/> - <location filename="mainwindow.cpp" line="1700"/> + <location filename="mainwindow.cpp" line="601"/> + <location filename="mainwindow.cpp" line="626"/> + <location filename="mainwindow.cpp" line="1837"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1362"/> - <source>Merge retry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1363"/> - <source>Merge retry successful.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1625"/> + <location filename="mainwindow.cpp" line="1750"/> <source>the default branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1627"/> + <location filename="mainwindow.cpp" line="1752"/> <source>branch "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1630"/> + <location filename="mainwindow.cpp" line="1771"/> <source>On %1. Not at the head of the branch: consider updating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1632"/> + <location filename="mainwindow.cpp" line="1760"/> <source><b>Awaiting merge</b> on %1</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location filename="mainwindow.cpp" line="308"/> + <source>You are about to commit %n file(s).</source> + <translation type="unfinished"> + <numerusform>You are about to commit %n file.</numerusform> + <numerusform>You are about to commit %n files.</numerusform> + </translation> + </message> <message> - <location filename="mainwindow.cpp" line="1634"/> + <location filename="mainwindow.cpp" line="1459"/> + <source><qt><h3>Update successful</h3><p>%1</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1464"/> + <source><qt><h3>Merge successful</h3><p>%1</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1470"/> + <source>Resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1471"/> + <source><qt><h3>Merge resolved</h3><p>Merge resolved successfully.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1758"/> + <source>Nothing committed to this repository yet</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1762"/> + <source>Have unresolved files following merge on %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1764"/> + <source>Have merged but not yet committed on %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1768"/> + <source>On %1. Not at the head of the branch</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="mainwindow.cpp" line="1774"/> + <source>At one of %n heads of %1</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="mainwindow.cpp" line="1776"/> <source>At the head of %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1643"/> + <location filename="mainwindow.cpp" line="1783"/> <source>Init local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1644"/> + <location filename="mainwindow.cpp" line="1784"/> <source>Create an empty local repository in selected folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1646"/> + <location filename="mainwindow.cpp" line="1786"/> <source>Clone from remote</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1647"/> + <location filename="mainwindow.cpp" line="1787"/> <source>Clone from remote repository into local repository in selected folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1649"/> + <location filename="mainwindow.cpp" line="1789"/> <source>Open...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1650"/> + <location filename="mainwindow.cpp" line="1790"/> <source>Open repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1653"/> + <location filename="mainwindow.cpp" line="1793"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1654"/> + <location filename="mainwindow.cpp" line="1794"/> <source>View and change application settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1657"/> + <location filename="mainwindow.cpp" line="1797"/> <source>Exit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1659"/> + <location filename="mainwindow.cpp" line="1799"/> <source>Exit application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1663"/> + <location filename="mainwindow.cpp" line="1803"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1664"/> + <location filename="mainwindow.cpp" line="1804"/> <source>Refresh (info of) status of workfolder files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1666"/> + <location filename="mainwindow.cpp" line="1806"/> <source>Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1667"/> + <location filename="mainwindow.cpp" line="1807"/> <source>View info of changesets incoming to us from remote repository (on pull operation)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1669"/> + <location filename="mainwindow.cpp" line="1809"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1670"/> + <location filename="mainwindow.cpp" line="1810"/> <source>Pull changesets from remote repository to local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1672"/> + <location filename="mainwindow.cpp" line="1812"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1673"/> + <location filename="mainwindow.cpp" line="1813"/> <source>Push local changesets to remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1676"/> - <location filename="mainwindow.cpp" line="1679"/> + <location filename="mainwindow.cpp" line="1816"/> <source>Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1677"/> - <source>Filediff: View differences between selected working folder file and local repository file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1680"/> + <location filename="mainwindow.cpp" line="1817"/> <source>Folderdiff: View all differences between working folder files and local repository files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1682"/> + <location filename="mainwindow.cpp" line="1819"/> <source>View changesetdiff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1683"/> + <location filename="mainwindow.cpp" line="1820"/> <source>Change set diff: View differences between all files of 2 repository changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1685"/> + <location filename="mainwindow.cpp" line="1822"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1686"/> + <location filename="mainwindow.cpp" line="1823"/> <source>Undo selected working folder file changes (return to local repository version)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1688"/> + <location filename="mainwindow.cpp" line="1825"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1689"/> + <location filename="mainwindow.cpp" line="1826"/> <source>Add working folder file(s) (selected or all yet untracked) to local repository (on next commit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1691"/> + <location filename="mainwindow.cpp" line="1828"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1692"/> + <location filename="mainwindow.cpp" line="1829"/> <source>Remove selected working folder file from local repository (on next commit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1695"/> + <location filename="mainwindow.cpp" line="1832"/> <source>Update working folder from local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1697"/> + <location filename="mainwindow.cpp" line="1834"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1698"/> + <location filename="mainwindow.cpp" line="1835"/> <source>Save selected file(s) or all changed files in working folder (and all subfolders) to local repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1701"/> + <location filename="mainwindow.cpp" line="1838"/> <source>Merge two local repository changesets to working folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1707"/> + <location filename="mainwindow.cpp" line="1844"/> <source>Annotate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1708"/> + <location filename="mainwindow.cpp" line="1845"/> <source>Show line-by-line version information for selected file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1710"/> - <source>Resolve (list)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1711"/> - <source>Resolve (list): Show list of files needing merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1713"/> - <source>Resolve (mark)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1714"/> - <source>Resolve (mark): Mark selected file status as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1716"/> - <source>Retry merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1717"/> - <source>Retry merge after failed merge attempt.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="mainwindow.cpp" line="1719"/> + <location filename="mainwindow.cpp" line="1847"/> <source>Tag revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1720"/> + <location filename="mainwindow.cpp" line="1848"/> <source>Give decsriptive name (tag) to current workfolder parent revision.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1722"/> + <location filename="mainwindow.cpp" line="1850"/> <source>Edit .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1723"/> + <location filename="mainwindow.cpp" line="1851"/> <source>Edit .hgignore file (file contains names of files that should be ignored by mercurial)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1725"/> + <location filename="mainwindow.cpp" line="1853"/> <source>Serve (via http)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1726"/> + <location filename="mainwindow.cpp" line="1854"/> <source>Serve local repository via http for workgroup access</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1729"/> + <location filename="mainwindow.cpp" line="1857"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1730"/> + <location filename="mainwindow.cpp" line="1858"/> <source>Show the application's About box</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1732"/> + <location filename="mainwindow.cpp" line="1860"/> <source>About Qt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1733"/> + <location filename="mainwindow.cpp" line="1861"/> <source>Show the Qt library's About box</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1736"/> + <location filename="mainwindow.cpp" line="1864"/> <source>Clear selections</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1742"/> - <location filename="mainwindow.cpp" line="1777"/> + <location filename="mainwindow.cpp" line="1870"/> + <location filename="mainwindow.cpp" line="1905"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1753"/> + <location filename="mainwindow.cpp" line="1881"/> <source>Advanced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1770"/> + <location filename="mainwindow.cpp" line="1898"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="mainwindow.cpp" line="1816"/> + <location filename="mainwindow.cpp" line="1942"/> <source>Ready</source> <translation type="unfinished"></translation> </message> @@ -892,7 +932,7 @@ <context> <name>QApplication</name> <message> - <location filename="main.cpp" line="29"/> + <location filename="main.cpp" line="30"/> <source>EasyMercurial</source> <translation type="unfinished"></translation> </message> @@ -901,32 +941,38 @@ <name>QObject</name> <message> <location filename="changeset.cpp" line="72"/> - <source>Identifier</source> + <source>Identifier:</source> + <oldsource>Identifier</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="changeset.cpp" line="73"/> - <source>Author</source> + <source>Author:</source> + <oldsource>Author</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="changeset.cpp" line="74"/> - <source>Date</source> + <source>Date:</source> + <oldsource>Date</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="changeset.cpp" line="75"/> - <source>Branch</source> + <source>Branch:</source> + <oldsource>Branch</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="changeset.cpp" line="76"/> - <source>Tag</source> + <source>Tag:</source> + <oldsource>Tag</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="changeset.cpp" line="77"/> - <source>Comment</source> + <source>Comment:</source> + <oldsource>Comment</oldsource> <translation type="unfinished"></translation> </message> </context> @@ -969,37 +1015,42 @@ <context> <name>UncommittedItem</name> <message> - <location filename="uncommitteditem.cpp" line="71"/> - <source><qt>&nbsp;<b>Uncommitted changes</b></qt></source> + <location filename="uncommitteditem.cpp" line="72"/> + <source><qt><b>&nbsp;Uncommitted changes</b></qt></source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="77"/> + <location filename="uncommitteditem.cpp" line="78"/> <source>Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="82"/> + <location filename="uncommitteditem.cpp" line="80"/> + <source>Show summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="uncommitteditem.cpp" line="85"/> <source>Commit...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="84"/> + <location filename="uncommitteditem.cpp" line="87"/> <source>Revert...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="130"/> + <location filename="uncommitteditem.cpp" line="133"/> <source>Uncommitted changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="135"/> + <location filename="uncommitteditem.cpp" line="138"/> <source>Uncommitted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="uncommitteditem.cpp" line="139"/> + <location filename="uncommitteditem.cpp" line="142"/> <source>changes</source> <translation type="unfinished"></translation> </message>