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