Mercurial > hg > easyhg
view easyhg_en.ts @ 532:06507a59f2b8 easyhg_v1.1
This will do for the Merge topic
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 17:24:47 +0000 |
parents | e29685e52654 |
children | 533519ebc0cb |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> <TS version="2.0" language="en_GB"> <context> <name>AnnotateDialog</name> <message> <source>User</source> <translation type="unfinished"></translation> </message> <message> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> <source>Date</source> <translation type="unfinished"></translation> </message> <message> <source>Content</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ChangesetItem</name> <message> <source><qt><b>&nbsp;Revision: </b>%1</qt></source> <translation type="unfinished"></translation> </message> <message> <source>Copy identifier to clipboard</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to parent %1</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to parent</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to current working folder</source> <translation type="unfinished"></translation> </message> <message> <source>Update to this revision</source> <translation type="unfinished"></translation> </message> <message> <source>Merge from here to current</source> <translation type="unfinished"></translation> </message> <message> <source>Add tag...</source> <translation type="unfinished"></translation> </message> <message> <source>Summarise changes</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to left parent</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to right parent</source> <translation type="unfinished"></translation> </message> <message> <source>Start new branch...</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ClickableLabel</name> <message> <source><u>%1</u></source> <translation type="unfinished"></translation> </message> </context> <context> <name>ConfirmCommentDialog</name> <message> <source><p>Please enter your comment:</qt></source> <translation type="unfinished"></translation> </message> </context> <context> <name>FileStatusWidget</name> <message> <source>Unmodified:</source> <translation type="unfinished"></translation> </message> <message> <source>Modified:</source> <translation type="unfinished"></translation> </message> <message> <source>Added:</source> <translation type="unfinished"></translation> </message> <message> <source>Removed:</source> <translation type="unfinished"></translation> </message> <message> <source>Missing:</source> <translation type="unfinished"></translation> </message> <message> <source>In Conflict:</source> <translation type="unfinished"></translation> </message> <message> <source>Untracked:</source> <translation type="unfinished"></translation> </message> <message> <source>You have not changed these files.</source> <translation type="unfinished"></translation> </message> <message> <source>You have changed these files since you last committed them.</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Files highlighted <font color=#d40000>in red</font> have appeared since your most recent commit or update.</source> <translation type="unfinished"></translation> </message> <message> <source>Ignored:</source> <translation type="unfinished"></translation> </message> <message> <source>These files will be added to version control next time you commit them.</source> <translation type="unfinished"></translation> </message> <message> <source>These files will be removed from version control next time you commit them.<br>They will not be deleted from the local folder.</source> <translation type="unfinished"></translation> </message> <message> <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.</source> <translation type="unfinished"></translation> </message> <message> <source>These files have names that match entries in the working folder's .hgignore file,<br>and so will be ignored by the version control system.</source> <translation type="unfinished"></translation> </message> <message> <source>Show all files</source> <translation type="unfinished"></translation> </message> <message> <source><qt>This area will list files in your working folder that you have changed.<br><br>At the moment you have no uncommitted changes.<br><br>To see changes previously made to the repository,<br>switch to the History tab.<br><br>%1</qt></source> <translation type="unfinished"></translation> </message> <message> <source>To open the working folder in Finder,<br>click on the &ldquo;Local&rdquo; folder path shown above.</source> <translation type="unfinished"></translation> </message> <message> <source>To open the working folder in Windows Explorer,<br>click on the &ldquo;Local&rdquo; folder path shown above.</source> <translation type="unfinished"></translation> </message> <message> <source>To open the working folder in your system file manager,<br>click the &ldquo;Local&rdquo; folder path shown above.</source> <translation type="unfinished"></translation> </message> <message> <source><qt>You have no uncommitted changes.</qt></source> <translation type="unfinished"></translation> </message> <message> <source>Show annotated version</source> <translation type="unfinished"></translation> </message> <message> <source>Diff to parent</source> <translation type="unfinished"></translation> </message> <message> <source>Commit...</source> <translation type="unfinished"></translation> </message> <message> <source>Revert to last committed state</source> <translation type="unfinished"></translation> </message> <message> <source>Rename...</source> <translation type="unfinished"></translation> </message> <message> <source>Copy...</source> <translation type="unfinished"></translation> </message> <message> <source>Add to version control</source> <translation type="unfinished"></translation> </message> <message> <source>Remove from version control</source> <translation type="unfinished"></translation> </message> <message> <source>Redo merge</source> <translation type="unfinished"></translation> </message> <message> <source>Mark conflict as resolved</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore...</source> <translation type="unfinished"></translation> </message> <message> <source>Edit .hgignore File</source> <translation type="unfinished"></translation> </message> <message> <source>These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>HgIgnoreDialog</name> <message> <source>Ignore files</source> <translation type="unfinished"></translation> </message> <message> <source>You have asked to ignore the following files:</p><p></source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>You have asked to ignore %n file(s).</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> <source>Ignore these files only</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore files with these names, in any folder</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore this file only</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore files with the same name as this, in any folder</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore the whole folder "%1"</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore all files with these extensions: %1</source> <translation type="unfinished"></translation> </message> <message> <source>Ignore all files with the extension "%1"</source> <translation type="unfinished"></translation> </message> <message> <source><p>Please choose whether to:</p></source> <translation type="unfinished"></translation> </message> <message> <source>Ignore</source> <translation type="unfinished"></translation> </message> </context> <context> <name>HgRunner</name> <message> <source>User name:</source> <translation type="unfinished"></translation> </message> <message> <source>User name for "%1":</source> <translation type="unfinished"></translation> </message> <message> <source>Enter user name</source> <translation type="unfinished"></translation> </message> <message> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> <source>Password for "%1" at "%2":</source> <translation type="unfinished"></translation> </message> <message> <source>Password for user "%1":</source> <translation type="unfinished"></translation> </message> <message> <source>Enter password</source> <translation type="unfinished"></translation> </message> </context> <context> <name>HgTabWidget</name> <message> <source>My work</source> <translation type="unfinished"></translation> </message> <message> <source>History</source> <translation type="unfinished"></translation> </message> </context> <context> <name>IncomingDialog</name> <message> <source>No changes waiting to pull</source> <translation type="unfinished"></translation> </message> <message> <source>The command output was:</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>There are %n change(s) ready to pull</source> <translation> <numerusform>There is %n change ready to pull</numerusform> <numerusform>There are %n changes ready to pull</numerusform> </translation> </message> <message> <source><qt>Your local repository already contains all changes found in the remote repository.</qt></source> <translation type="unfinished"></translation> </message> </context> <context> <name>MainWindow</name> <message> <source>EasyMercurial</source> <translation type="unfinished"></translation> </message> <message> <source>About EasyMercurial</source> <translation type="unfinished"></translation> </message> <message> <source>Commit files</source> <translation type="unfinished"></translation> </message> <message> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> <source>Enter tag:</source> <translation type="unfinished"></translation> </message> <message> <source>Revert files</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <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> <translation> <numerusform>You are about to <b>revert</b> %n file.<br><br>This will <b>throw away any changes</b> that you have made to this file but have not committed.</numerusform> <numerusform>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.</numerusform> </translation> </message> <message> <source>Merge from the default branch</source> <translation type="unfinished"></translation> </message> <message> <source>Merge from branch "%1"</source> <translation type="unfinished"></translation> </message> <message> <source>Merge from %1</source> <translation type="unfinished"></translation> </message> <message> <source>Confirm pull</source> <translation type="unfinished"></translation> </message> <message> <source>Confirm push</source> <translation type="unfinished"></translation> </message> <message> <source>Open Repository</source> <translation type="unfinished"></translation> </message> <message> <source><qt><big>What would you like to open?</big></qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt><center><img src=":images/browser-64.png"><br>Remote repository</center></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Open a remote Mercurial repository, by cloning from its URL into a local folder.</source> <translation type="unfinished"></translation> </message> <message> <source><qt><center><img src=":images/hglogo-64.png"><br>Local repository</center></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Open an existing local Mercurial repository.</source> <translation type="unfinished"></translation> </message> <message> <source><qt><center><img src=":images/hdd_unmount-64.png"><br>File folder</center></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Open a local folder, by creating a Mercurial repository in it.</source> <translation type="unfinished"></translation> </message> <message> <source>File chosen</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Folder does not exist</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Path is in existing repository</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Path is a file</source> <translation type="unfinished"></translation> </message> <message> <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> <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> <source>Folder exists</source> <translation type="unfinished"></translation> </message> <message> <source>Path is inside a repository</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Folder has no repository</source> <translation type="unfinished"></translation> </message> <message> <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> <source>Repository exists</source> <translation type="unfinished"></translation> </message> <message> <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 numerus="yes"> <source>Pushed %n changeset(s)</source> <translation> <numerusform>Pushed %n changeset</numerusform> <numerusform>Pushed %n changesets</numerusform> </translation> </message> <message> <source>No changes to push</source> <translation type="unfinished"></translation> </message> <message> <source>Push complete</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>Pulled %n changeset(s)</source> <translation> <numerusform>Pulled %n changeset</numerusform> <numerusform>Pulled %n changesets</numerusform> </translation> </message> <message> <source>No changes to pull</source> <translation type="unfinished"></translation> </message> <message> <source>Pull complete</source> <translation type="unfinished"></translation> </message> <message> <source>Command failed</source> <translation type="unfinished"></translation> </message> <message> <source>Change summary</source> <translation type="unfinished"></translation> </message> <message> <source>Summary of uncommitted changes</source> <translation type="unfinished"></translation> </message> <message> <source>Update</source> <translation type="unfinished"></translation> </message> <message> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> <source>the default branch</source> <translation type="unfinished"></translation> </message> <message> <source>branch "%1"</source> <translation type="unfinished"></translation> </message> <message> <source>On %1. Not at the head of the branch: consider updating</source> <translation type="unfinished"></translation> </message> <message> <source><b>Awaiting merge</b> on %1</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>You are about to commit %n file(s) to %1.</source> <translation type="obsolete"> <numerusform>You are about to commit %n file to %1.</numerusform> <numerusform>You are about to commit %n files to %1.</numerusform> </translation> </message> <message> <source><qt><h3>Update successful</h3><p>%1</p></source> <translation type="unfinished"></translation> </message> <message> <source>Resolved</source> <translation type="unfinished"></translation> </message> <message> <source>Nothing committed to this repository yet</source> <translation type="unfinished"></translation> </message> <message> <source>Have unresolved files following merge on %1</source> <translation type="unfinished"></translation> </message> <message> <source>Have merged but not yet committed on %1</source> <translation type="unfinished"></translation> </message> <message> <source>On %1. Not at the head of the branch</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>At one of %n heads of %1</source> <translation> <numerusform>At one of %n heads of %1</numerusform> <numerusform>At one of %n heads of %1</numerusform> </translation> </message> <message> <source>At the head of %1</source> <translation type="unfinished"></translation> </message> <message> <source>View and change application settings</source> <translation type="unfinished"></translation> </message> <message> <source>Preview</source> <translation type="unfinished"></translation> </message> <message> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> <source>Push</source> <translation type="unfinished"></translation> </message> <message> <source>Diff</source> <translation type="unfinished"></translation> </message> <message> <source>Add</source> <translation type="unfinished"></translation> </message> <message> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> <source>File</source> <translation type="unfinished"></translation> </message> <message> <source>Ready</source> <translation type="unfinished"></translation> </message> <message> <source><p><b>Note:</b> you are committing only the files you have selected, not all of the files that have been changed!</source> <translation type="unfinished"></translation> </message> <message> <source><h3>%1</h3><p>%2%3</source> <translation type="unfinished"></translation> </message> <message> <source>New Branch</source> <translation type="unfinished"></translation> </message> <message> <source>Enter new branch name:</source> <translation type="unfinished"></translation> </message> <message> <source><p><b>Note:</b> you are reverting only the files you have selected, not all of the files that have been changed!</source> <translation type="unfinished"></translation> </message> <message> <source>Unable to revert</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Sorry, unable to revert these files</b><br><br>EasyMercurial can only revert a subset of files during a merge if it still has a record of which parent was the original merge target; that information is no longer available.<br><br>This is a limitation of EasyMercurial. Consider reverting all files, or using hg revert with a specific revision at the command-line instead.</qt></source> <translation type="unfinished"></translation> </message> <message> <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> <source><qt><h3>Pull from remote repository?</h3></qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt><p>You are about to pull changes from the remote repository at <code>%1</code>.</p></qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt><h3>Push to remote repository?</h3></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Serve</source> <translation type="unfinished"></translation> </message> <message> <source>Failed to identify an active IPv4 address</source> <translation type="unfinished"></translation> </message> <message> <source>Provide a new URL to use for push and pull actions from the current local repository.</source> <translation type="unfinished"></translation> </message> <message> <source>Path does not exist</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Path does not exist: create it?</b><br><br>You asked to open a remote repository by cloning it to "%1". This folder does not exist, and neither does its parent.<br><br>Would you like to create the parent folder as well?</qt></source> <translation type="unfinished"></translation> </message> <message> <source>Failed to create folder</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Failed to create folder</b><br><br>Sorry, the path for the parent folder "%1" could not be created.</qt></source> <translation type="unfinished"></translation> </message> <message> <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 different folder name for the local repository.</qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to "%1", but this folder already exists and so cannot be cloned to.<br><br>Would you like to create the new folder "%2" instead?</qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Local folder already exists</b><br><br>You asked to open a remote repository by cloning it to "%1", but this file or folder already exists and so cannot be cloned to.<br>Please provide a different folder name for the local repository.</qt></source> <translation type="unfinished"></translation> </message> <message> <source><qt>Successfully pushed to the remote repository at <code>%1</code>.</qt></source> <translation type="unfinished"></translation> </message> <message> <source>The remote repository already contains all changes that have been committed locally.</source> <translation type="unfinished"></translation> </message> <message> <source>%1<p>You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.</source> <translation type="unfinished"></translation> </message> <message> <source>Your local repository already contains all changes found in the remote repository.</source> <translation type="unfinished"></translation> </message> <message> <source>Push failed</source> <translation type="unfinished"></translation> </message> <message> <source>Your local repository could not be pushed to the remote repository.<br><br>You may need to merge the changes locally first.</source> <translation type="unfinished"></translation> </message> <message> <source>Your local repository could not be pushed to the remote repository.<br><br>The remote repository may have been changed by someone else since you last pushed. Try pulling and merging their changes into your local repository first.</source> <translation type="unfinished"></translation> </message> <message> <source>Preferences</source> <translation type="unfinished"></translation> </message> <message> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> <source>Failed to run Mercurial</source> <translation type="unfinished"></translation> </message> <message> <source>Failed to run Mercurial with extension enabled</source> <translation type="unfinished"></translation> </message> <message> <source>The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication might not work if you do this.</source> <translation type="unfinished"></translation> </message> <message> <source>A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output.</source> <translation type="unfinished"></translation> </message> <message> <source>Clone</source> <translation type="unfinished"></translation> </message> <message> <source>The remote repository was successfully cloned to the local folder <code>%1</code>.</source> <translation type="unfinished"></translation> </message> <message> <source>Summary of changes</source> <translation type="unfinished"></translation> </message> <message> <source>No changes</source> <translation type="unfinished"></translation> </message> <message> <source>Merge successful</source> <translation type="unfinished"></translation> </message> <message> <source>Remember to test and commit the result before making any further changes.</source> <translation type="unfinished"></translation> </message> <message> <source><qt><h3>Merge resolved</h3><p>Merge resolved successfully.<br>Remember to test and commit the result before making any further changes.</p></source> <translation type="unfinished"></translation> </message> <message> <source>EasyMercurial: %1</source> <translation type="unfinished"></translation> </message> <message> <source>No repository open</source> <translation type="unfinished"></translation> </message> <message> <source>(Examining repository)</source> <translation type="unfinished"></translation> </message> <message> <source>No working copy yet: consider updating</source> <translation type="unfinished"></translation> </message> <message> <source>On %1. New branch: has not yet been committed</source> <translation type="unfinished"></translation> </message> <message> <source>Open an existing repository or working folder</source> <translation type="unfinished"></translation> </message> <message> <source>Refresh the window to show the current state of the working folder</source> <translation type="unfinished"></translation> </message> <message> <source>See what changes are available in the remote repository waiting to be pulled</source> <translation type="unfinished"></translation> </message> <message> <source>Pull changes from the remote repository to the local repository</source> <translation type="unfinished"></translation> </message> <message> <source>Push changes from the local repository to the remote repository</source> <translation type="unfinished"></translation> </message> <message> <source>See what has changed in the working folder compared with the last committed state</source> <translation type="unfinished"></translation> </message> <message> <source>Throw away your changes and return to the last committed state</source> <translation type="unfinished"></translation> </message> <message> <source>Update the working folder to the head of the current repository branch</source> <translation type="unfinished"></translation> </message> <message> <source>Commit your changes to the local repository</source> <translation type="unfinished"></translation> </message> <message> <source>Merge the two independent sets of changes in the local repository into the working folder</source> <translation type="unfinished"></translation> </message> <message> <source>Edit the .hgignore file, containing the names of files that should be ignored by Mercurial</source> <translation type="unfinished"></translation> </message> <message> <source><qt><h2>EasyMercurial v%1</h2><font size=-1><p>EasyMercurial is a simple user interface for the Mercurial</a> version control system.</p><h4>Credits and Copyright</h4><p>Development carried out by Chris Cannam for SoundSoftware.ac.uk at the Centre for Digital Music, Queen Mary, University of London.</p><p>EasyMercurial is based on HgExplorer by Jari Korhonen, with thanks.</p><p style="margin-left: 2em;">Copyright &copy; 2011 Queen Mary, University of London.<br>Copyright &copy; 2010 Jari Korhonen.<br>Copyright &copy; 2011 Chris Cannam.</p><p style="margin-left: 2em;">This program requires Mercurial, by Matt Mackall and others.<br>This program uses Qt by Nokia.<br>This program uses Nuvola icons by David Vignoni.<br>This program may use KDiff3 by Joachim Eibl.<br>This program may use PyQt by River Bank Computing.<br>Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others.</p><h4>License</h4><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.</p></font></source> <translation type="unfinished"></translation> </message> <message> <source>You are about to commit changes to the following files in %1:</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> <source>You are about to commit changes to %n file(s) in %1.</source> <translation> <numerusform>You are about to commit changes to %n file in %1.</numerusform> <numerusform>You are about to commit changes to %n files in %1.</numerusform> </translation> </message> <message> <source>Co&mmit</source> <translation type="unfinished"></translation> </message> <message> <source>Start &Branch</source> <translation type="unfinished"></translation> </message> <message> <source>Add &Tag</source> <translation type="unfinished"></translation> </message> <message> <source><qt><h3>Ignored File Patterns</h3></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Write failed</source> <translation type="unfinished"></translation> </message> <message> <source>Failed to open file %1 for writing</source> <translation type="unfinished"></translation> </message> <message> <source>Ignored files</source> <translation type="unfinished"></translation> </message> <message> <source>The following lines have been added to the .hgignore file for this working copy:</source> <translation type="unfinished"></translation> </message> <message> <source>Re&vert</source> <translation type="unfinished"></translation> </message> <message> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> <source>Rename <code>%1</code> to:</source> <translation type="unfinished"></translation> </message> <message> <source>Re&name</source> <translation type="unfinished"></translation> </message> <message> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> <source>Copy <code>%1</code> to:</source> <translation type="unfinished"></translation> </message> <message> <source>Co&py</source> <translation type="unfinished"></translation> </message> <message> <source>&Pull</source> <translation type="unfinished"></translation> </message> <message> <source><p><b>Note:</b> You have uncommitted changes. If you want to push these changes to the remote repository, you need to commit them first.</source> <translation type="unfinished"></translation> </message> <message> <source><qt><p>You are about to push your commits to the remote repository at <code>%1</code>.</p>%2</qt></source> <translation type="unfinished"></translation> </message> <message> <source>&Push</source> <translation type="unfinished"></translation> </message> <message> <source>Sharing Repository</source> <translation type="unfinished"></translation> </message> <message> <source>Your local repository is now being made temporarily available via HTTP for workgroup access.</source> <translation type="unfinished"></translation> </message> <message> <source>Users who have network access to your computer can now clone your repository, by using one of the following URLs as a remote location:</source> <translation type="unfinished"></translation> </message> <message> <source>Users who have network access to your computer can now clone your repository, by using the following URL as a remote location:</source> <translation type="unfinished"></translation> </message> <message> <source><p>Press Close to terminate this server, end remote access, and return.</p></source> <translation type="unfinished"></translation> </message> <message> <source>Share Repository</source> <translation type="unfinished"></translation> </message> <message> <source>Set Remote Location</source> <translation type="unfinished"></translation> </message> <message> <source><qt><big>Set the remote location</big></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Provide a URL to use for push and pull actions from the current local repository.<br>This will be the default for subsequent pushes and pulls.<br>You can change it using &ldquo;Set Remote Location&rdquo; on the File menu.</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Initialise a repository here?</b><br><br>You asked to open "%1".<br>This folder is not a Mercurial working copy.<br><br>Would you like to initialise a repository here?</qt></source> <translation type="unfinished"></translation> </message> <message> <source>New changes will be highlighted in yellow in the history.</source> <translation type="unfinished"></translation> </message> <message> <source>Your local repository could not be pushed to the remote repository.<br><br>You have an uncommitted merge in your local folder. You probably need to commit it before you push.</source> <translation type="unfinished"></translation> </message> <message> <source>Authorization failed</source> <translation type="unfinished"></translation> </message> <message> <source>You may have entered an incorrect user name or password, or the remote URL may be wrong.<br><br>Or you may lack the necessary permissions on the remote repository.<br><br>Check with the administrator of your remote repository if necessary.</source> <translation type="unfinished"></translation> </message> <message> <source>The Mercurial program either could not be found or failed to run.<br><br>Check that the Mercurial program path is correct in %1.</source> <translation type="unfinished"></translation> </message> <message> <source>Merge failed</source> <translation type="unfinished"></translation> </message> <message> <source>Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu.</source> <translation type="unfinished"></translation> </message> <message> <source>A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.</source> <translation type="unfinished"></translation> </message> <message> <source>Newer Mercurial version required</source> <translation type="unfinished"></translation> </message> <message> <source>To use EasyMercurial, you should have at least Mercurial v1.7 installed.<br><br>The version found on this system (v%1.%2) does not support all of the features required by EasyMercurial.</source> <translation type="unfinished"></translation> </message> <message> <source>Open successful</source> <translation type="unfinished"></translation> </message> <message> <source>No recent local repositories</source> <translation type="unfinished"></translation> </message> <message> <source>&Open...</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> <source>Set Remote &Location...</source> <translation type="unfinished"></translation> </message> <message> <source>Set or change the default remote repository for pull and push actions</source> <translation type="unfinished"></translation> </message> <message> <source>&Settings...</source> <translation type="unfinished"></translation> </message> <message> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> <source>Exit EasyMercurial</source> <translation type="unfinished"></translation> </message> <message> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+R</source> <translation type="unfinished"></translation> </message> <message> <source>Pre&view Incoming Changes</source> <translation type="unfinished"></translation> </message> <message> <source>Pu&ll from Remote Repository</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+L</source> <translation type="unfinished"></translation> </message> <message> <source>Pus&h to Remote Repository</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+H</source> <translation type="unfinished"></translation> </message> <message> <source>&Diff</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+D</source> <translation type="unfinished"></translation> </message> <message> <source>&Add Files</source> <translation type="unfinished"></translation> </message> <message> <source>+</source> <translation type="unfinished"></translation> </message> <message> <source>Mark the selected files to be added on the next commit</source> <translation type="unfinished"></translation> </message> <message> <source>&Remove Files</source> <translation type="unfinished"></translation> </message> <message> <source>Del</source> <translation type="unfinished"></translation> </message> <message> <source>Mark the selected files to be removed from version control on the next commit</source> <translation type="unfinished"></translation> </message> <message> <source>&Ignore Files...</source> <translation type="unfinished"></translation> </message> <message> <source>Add the selected filenames to the ignored list, of files that should never be tracked in this repository</source> <translation type="unfinished"></translation> </message> <message> <source>Edit Ignored List</source> <translation type="unfinished"></translation> </message> <message> <source>&Update to Branch Head</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+U</source> <translation type="unfinished"></translation> </message> <message> <source>&Commit...</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+Return</source> <translation type="unfinished"></translation> </message> <message> <source>&Merge</source> <translation type="unfinished"></translation> </message> <message> <source>Ctrl+M</source> <translation type="unfinished"></translation> </message> <message> <source>Serve local repository temporarily via HTTP for workgroup access</source> <translation type="unfinished"></translation> </message> <message> <source>&File</source> <translation type="unfinished"></translation> </message> <message> <source>Open Re&cent</source> <translation type="unfinished"></translation> </message> <message> <source>&Work</source> <translation type="unfinished"></translation> </message> <message> <source>&Remote</source> <translation type="unfinished"></translation> </message> <message> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> <source>Remote</source> <translation type="unfinished"></translation> </message> <message> <source>Work</source> <translation type="unfinished"></translation> </message> </context> <context> <name>MoreInformationDialog</name> <message> <source>More Details...</source> <translation type="unfinished"></translation> </message> <message> <source>Show Details...</source> <translation type="unfinished"></translation> </message> <message> <source>Hide Details...</source> <translation type="unfinished"></translation> </message> </context> <context> <name>MultiChoiceDialog</name> <message> <source>&URL:</source> <translation type="unfinished"></translation> </message> <message> <source>&File:</source> <translation type="unfinished"></translation> </message> <message> <source>Browse...</source> <translation type="unfinished"></translation> </message> <message> <source>Open Directory</source> <translation type="unfinished"></translation> </message> <message> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> <source>&Folder:</source> <translation type="unfinished"></translation> </message> <message> <source>Documents</source> <translation type="unfinished"></translation> </message> <message> <source>My Documents</source> <translation type="unfinished"></translation> </message> <message> <source>Desktop</source> <translation type="unfinished"></translation> </message> </context> <context> <name>QApplication</name> <message> <source>EasyMercurial</source> <translation type="unfinished"></translation> </message> </context> <context> <name>QObject</name> <message> <source>Identifier:</source> <translation type="unfinished"></translation> </message> <message> <source>Author:</source> <translation type="unfinished"></translation> </message> <message> <source>Date:</source> <translation type="unfinished"></translation> </message> <message> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> <source>Comment:</source> <translation type="unfinished"></translation> </message> </context> <context> <name>RepositoryDialog</name> <message> <source>Open Repository</source> <translation type="unfinished"></translation> </message> </context> <context> <name>SettingsDialog</name> <message> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> <source>User details</source> <translation type="unfinished"></translation> </message> <message> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> <source>Email address:</source> <translation type="unfinished"></translation> </message> <message> <source>Presentation</source> <translation type="unfinished"></translation> </message> <message> <source>Show labels on toolbar icons</source> <translation type="unfinished"></translation> </message> <message> <source>Show long descriptions for file status headings</source> <translation type="unfinished"></translation> </message> <message> <source>Place the work and history views</source> <translation type="unfinished"></translation> </message> <message> <source>In separate tabs</source> <translation type="unfinished"></translation> </message> <message> <source>Side-by-side in a single pane</source> <translation type="unfinished"></translation> </message> <message> <source>Label the history timeline with</source> <translation type="unfinished"></translation> </message> <message> <source>Ages, for example "5 weeks ago"</source> <translation type="unfinished"></translation> </message> <message> <source>Dates, for example "2010-06-23"</source> <translation type="unfinished"></translation> </message> <message> <source>System application locations</source> <translation type="unfinished"></translation> </message> <message> <source>Mercurial (hg) program:</source> <translation type="unfinished"></translation> </message> <message> <source>Browse...</source> <translation type="unfinished"></translation> </message> <message> <source>External diff program:</source> <translation type="unfinished"></translation> </message> <message> <source>External file-merge program:</source> <translation type="unfinished"></translation> </message> <message> <source>EasyHg Mercurial extension:</source> <translation type="unfinished"></translation> </message> <message> <source>Use EasyHg Mercurial extension</source> <translation type="unfinished"></translation> </message> <message> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> <source>Mercurial program</source> <translation type="unfinished"></translation> </message> <message> <source>External diff program</source> <translation type="unfinished"></translation> </message> <message> <source>External file-merge program</source> <translation type="unfinished"></translation> </message> <message> <source>EasyHg Mercurial extension</source> <translation type="unfinished"></translation> </message> <message> <source>Restore default settings?</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>Restore default settings?</b><br><br>Are you sure you want to reset all settings to their default values?</source> <translation type="unfinished"></translation> </message> <message> <source>SSH program (for ssh URLs):</source> <translation type="unfinished"></translation> </message> <message> <source>SSH program</source> <translation type="unfinished"></translation> </message> </context> <context> <name>StartupDialog</name> <message> <source>About me</source> <translation type="unfinished"></translation> </message> <message> <source><qt><big>Welcome to EasyMercurial!</qt></big><br>How would you like to be identified in commit messages?</source> <translation type="unfinished"></translation> </message> <message> <source>Name:</source> <translation type="unfinished"></translation> </message> <message> <source>Email address:</source> <translation type="unfinished"></translation> </message> <message> <source><br>You will appear as:</source> <translation type="unfinished"></translation> </message> </context> <context> <name>UncommittedItem</name> <message> <source><qt><b>&nbsp;Uncommitted changes</b></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Diff</source> <translation type="unfinished"></translation> </message> <message> <source>Commit...</source> <translation type="unfinished"></translation> </message> <message> <source>Revert...</source> <translation type="unfinished"></translation> </message> <message> <source>Uncommitted changes</source> <translation type="unfinished"></translation> </message> <message> <source>Uncommitted</source> <translation type="unfinished"></translation> </message> <message> <source>changes</source> <translation type="unfinished"></translation> </message> <message> <source>Summarise changes</source> <translation type="unfinished"></translation> </message> <message> <source>Start new branch...</source> <translation type="unfinished"></translation> </message> <message> <source>Cancel new branch</source> <translation type="unfinished"></translation> </message> <message> <source><qt><b>&nbsp;Uncommitted merge</b></qt></source> <translation type="unfinished"></translation> </message> <message> <source>Uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> <source>merge</source> <translation type="unfinished"></translation> </message> </context> <context> <name>WorkStatusWidget</name> <message> <source>Local:</source> <translation type="unfinished"></translation> </message> <message> <source>Remote:</source> <translation type="unfinished"></translation> </message> <message> <source>State:</source> <translation type="unfinished"></translation> </message> </context> </TS>