Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: ChangesetItem Chris@155: Chris@168: Chris@168: <qt> Revision: %1</qt> Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Copy identifier to clipboard Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Diff to parent %1 Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Diff to parent Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Diff to current working folder Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Update to this revision Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Merge from here to current Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Add tag... Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: ConfirmCommentDialog Chris@155: Chris@155: Chris@155: Please enter your comment:</qt> Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: FileStatusWidget Chris@155: Chris@155: Chris@155: Local: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Remote: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: State: Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: You have no uncommitted changes. Chris@168: You have made no changes. Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Unmodified: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Modified: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Added: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Removed: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Missing: Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: In Conflict: Chris@168: Chris@168: Chris@168: Chris@168: Chris@155: Untracked: Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: You have not changed these files. Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: You have changed these files since you last committed them. Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: These files will be added to version control next time you commit. Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: These files will be removed from version control next time you commit. They will not be deleted from the local folder. Chris@155: Chris@155: Chris@155: Chris@168: 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@168: Chris@168: These files are unresolved following an incomplete merge. Select a file and use Merge to try to resolve the merge again. Chris@168: Chris@168: Chris@168: Chris@168: Chris@155: 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 or Ignore to remove it from this list. Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Files highlighted in red have appeared since your most recent commit or update. Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: HgRunner Chris@155: Chris@182: Chris@155: User name: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: User name for "%1": Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Enter user name Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Password: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Password for "%1" at "%2": Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Password for user "%1": Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Enter password Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: HgTabWidget Chris@155: Chris@155: Chris@155: My work Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: History Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: IncomingDialog Chris@155: Chris@155: Chris@155: No changes waiting to pull Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: The command output was: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: There are %n change(s) ready to pull Chris@155: Chris@155: There is %n change ready to pull Chris@155: There are %n changes ready to pull Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: MainWindow Chris@155: Chris@182: Chris@182: Chris@155: EasyMercurial Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: About EasyMercurial Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt><h2>About EasyMercurial</h2>EasyMercurial is a simple user interface for the Mercurial version control system.EasyMercurial is based on hgExplorer by Jari Korhonen, with thanks. 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 © 2010 Jari Korhonen</li><li>Copyright © 2010 Chris Cannam</li><li>Copyright © 2010 Queen Mary, University of London</li></ul> 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@155: Chris@155: Chris@155: Chris@182: Chris@155: Commit files Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Tag Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Enter tag: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Revert files Chris@155: Chris@155: Chris@155: Chris@182: Chris@182: Chris@182: Chris@182: Chris@155: <h3>%1</h3>%2 Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: You are about to commit the following files: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: 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@155: Chris@155: Chris@155: Chris@182: 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@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: 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@182: Chris@168: Merge from the default branch Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Merge from branch "%1" Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Merge from %1 Chris@168: Chris@168: Chris@168: Chris@182: Chris@155: Confirm pull Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Confirm pull from remote repository Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: You are about to pull from the following remote repository: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Confirm push Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Confirm push to remote repository Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: You are about to push to the following remote repository: Chris@155: Chris@155: Chris@155: Chris@182: Chris@182: Chris@182: Serve Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Failed to identify an active IPv4 address Chris@182: Chris@182: Chris@182: Chris@182: Starting server at %n address(es): Chris@182: Chris@182: Starting server at this address: Chris@182: Starting server at %n addresses: Chris@182: Chris@182: Chris@182: Chris@182: Chris@155: Open Repository Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt><big>What would you like to open?</big></qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt><center><img src=":images/browser-64.png"> Remote repository</center></qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Open a remote Mercurial repository, by cloning from its URL into a local folder. Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt><center><img src=":images/hglogo-64.png"> Local repository</center></qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Open an existing local Mercurial repository. Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt><center><img src=":images/hdd_unmount-64.png"> File folder</center></qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Open a local folder, by creating a Mercurial repository in it. Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: File chosen Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@182: Chris@155: Folder does not exist Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@182: Chris@155: Path is in existing repository Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@182: Chris@155: Path is a file Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@155: <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 new folder name for the local repository.</qt> Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@155: Folder exists Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt>Local folder already exists You asked to open a remote repository by cloning it to the local path "%1". This is the path of an existing folder. Please provide a new folder name for the local repository.</qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Path is inside a repository Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@155: Folder has no repository Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: <qt>Initialise a repository here? You asked to open "%1". This folder does not contain a Mercurial repository. Would you like to initialise a repository here?</qt> Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@155: Repository exists Chris@155: Chris@155: Chris@155: Chris@182: 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@182: Chris@155: Ok Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Mercurial command did not return any output. Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Pushed %n changeset(s) Chris@155: Chris@155: Pushed %n changeset Chris@155: Pushed %n changesets Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: No changes to push Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Push complete Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: The push command output was: Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Pulled %n changeset(s) Chris@155: Chris@155: Pulled %n changeset Chris@155: Pulled %n changesets Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: No changes to pull Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Pull complete Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: The pull command output was: Chris@155: Chris@155: Chris@155: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Push failed Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Your local repository could not be pushed to the remote repository. You may need to merge the changes locally first. The output of the push command was: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: 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. The output of the push command was: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Failed to run Mercurial Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: The Mercurial program either could not be found or failed to run. This may indicate a problem with the Mercurial installation, or with the EasyHg interaction extension. The test command said: Chris@182: Chris@182: Chris@182: Chris@182: Chris@155: <qt><h3>Command failed</h3>The following command failed:<code>%1</code>%2</qt> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Its output said:<code>%1</code> Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Command failed Chris@155: Chris@155: Chris@155: Chris@182: Chris@168: Change summary Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Summary of uncommitted changes Chris@168: Chris@168: Chris@168: Chris@182: Chris@182: Chris@182: Chris@155: Update Chris@155: Chris@155: Chris@155: Chris@182: Chris@182: Open a repository Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Quit Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Quit EasyMercurial Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Refresh the window to show the current state of the working folder Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: See what changes are available in the remote repository waiting to be pulled Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Pull changes from the remote repository to the local repository Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Push changes from the local repository to the remote repository Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: See what has changed in the working folder compared with the last committed state Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Throw away your changes and return to the last committed state Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Mark the selected file(s) to be added on the next commit Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Mark the selected file(s) to be removed from version control on the next commit Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Update the working folder to the head of the current repository branch Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Commit your changes to the local repository Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Merge the two independent sets of changes in the local repository into the working folder Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Edit .hgignore File Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Edit the .hgignore file, containing the names of files that should be ignored by Mercurial Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Serve via HTTP Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@155: Merge Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: the default branch Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: branch "%1" Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: On %1. Not at the head of the branch: consider updating Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Awaiting merge on %1 Chris@155: Chris@155: Chris@168: Chris@182: Chris@168: You are about to commit %n file(s). Chris@168: Chris@168: You are about to commit %n file. Chris@168: You are about to commit %n files. Chris@168: Chris@168: Chris@182: Chris@182: Chris@182: Running temporary server at %n address(es): Chris@182: Chris@182: Running temporary server at this address: Chris@182: Running temporary server at %n addresses: Chris@182: Chris@182: Chris@155: Chris@182: Chris@182: Press Close to stop the server and return. Chris@182: Chris@182: Chris@182: Chris@182: Chris@168: <qt><h3>Update successful</h3>%1 Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: <qt><h3>Merge successful</h3>%1 Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Resolved Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: <qt><h3>Merge resolved</h3>Merge resolved successfully. Chris@168: Chris@168: Chris@168: Chris@182: Chris@182: (Examining repository) Chris@182: Chris@182: Chris@182: Chris@182: Chris@168: Nothing committed to this repository yet Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Have unresolved files following merge on %1 Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: Have merged but not yet committed on %1 Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: On %1. Not at the head of the branch Chris@168: Chris@168: Chris@168: Chris@182: Chris@168: At one of %n heads of %1 Chris@168: Chris@168: Chris@168: Chris@168: Chris@168: Chris@182: Chris@155: At the head of %1 Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Open... Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Settings... Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: View and change application settings Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Refresh Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Preview Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Pull Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Push Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Diff Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Revert Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Add Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Remove Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Commit Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Annotate Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Show line-by-line version information for selected file Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Serve local repository via http for workgroup access Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: About Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Clear selections Chris@155: Chris@155: Chris@155: Chris@182: Chris@182: Chris@155: File Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Advanced Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Help Chris@155: Chris@155: Chris@155: Chris@182: Chris@155: Ready Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: MultiChoiceDialog Chris@155: Chris@155: Chris@155: &URL: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: &File: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Browse... Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Open Directory Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Open File Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: &Folder: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: QApplication Chris@155: Chris@168: Chris@155: EasyMercurial Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: QObject Chris@155: Chris@155: Chris@168: Identifier: Chris@168: Identifier Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: Author: Chris@168: Author Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: Date: Chris@168: Date Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: Branch: Chris@168: Branch Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: Tag: Chris@168: Tag Chris@155: Chris@155: Chris@155: Chris@155: Chris@168: Comment: Chris@168: Comment Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: RepositoryDialog Chris@155: Chris@155: Chris@155: Open Repository Chris@155: Chris@155: Chris@155: Chris@155: Chris@182: SettingsDialog Chris@182: Chris@182: Chris@182: Settings Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: User details Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Name: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Email address: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: System application locations Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Mercurial (hg) program: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Browse... Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External diff program: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External file-merge program: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External text editor: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: EasyHg Mercurial extension: Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Use EasyHg Mercurial extension Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: Mercurial program Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External diff program Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External file-merge program Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: External text editor Chris@182: Chris@182: Chris@182: Chris@182: Chris@182: EasyHg Mercurial extension Chris@182: Chris@182: Chris@182: Chris@182: Chris@155: StartupDialog Chris@155: Chris@155: Chris@155: About me Chris@155: 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: Chris@155: Name: Chris@155: Chris@155: Chris@155: Chris@155: Chris@155: Email address: Chris@155: 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: Chris@168: <qt> Uncommitted changes</qt> Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Diff Chris@155: Chris@155: Chris@155: Chris@168: Chris@182: Summarise changes Chris@182: Show summary Chris@168: Chris@168: Chris@168: Chris@168: Chris@155: Commit... Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Revert... Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Uncommitted changes Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: Uncommitted Chris@155: Chris@155: Chris@155: Chris@168: Chris@155: changes Chris@155: Chris@155: Chris@155: Chris@155: