# HG changeset patch # User Chris Cannam # Date 1313594880 -3600 # Node ID e29685e526547acca6aa007bb9e9a85c02745561 # Parent 896b7903e8f25f1bd715cbef58811c28855f7335 Update translations, fixing #266 diff -r 896b7903e8f2 -r e29685e52654 easyhg_en.qm Binary file easyhg_en.qm has changed diff -r 896b7903e8f2 -r e29685e52654 easyhg_en.ts --- a/easyhg_en.ts Wed Aug 17 16:09:04 2011 +0100 +++ b/easyhg_en.ts Wed Aug 17 16:28:00 2011 +0100 @@ -2,6 +2,25 @@ + AnnotateDialog + + User + + + + Revision + + + + Date + + + + Content + + + + ChangesetItem <qt> Revision: %1</qt> @@ -109,10 +128,6 @@ - These files are unresolved following an incomplete merge. Select a file and use Merge to try to resolve the merge again. - - - Files highlighted in red have appeared since your most recent commit or update. @@ -160,6 +175,112 @@ <qt>You have no uncommitted changes.</qt> + + Show annotated version + + + + Diff to parent + + + + Commit... + + + + Revert to last committed state + + + + Rename... + + + + Copy... + + + + Add to version control + + + + Remove from version control + + + + Redo merge + + + + Mark conflict as resolved + + + + Ignore... + + + + Edit .hgignore File + + + + These files are unresolved following an incomplete merge. Use Merge to try to resolve the merge again. + + + + + HgIgnoreDialog + + Ignore files + + + + You have asked to ignore the following files: + + + + You have asked to ignore %n file(s). + + + + + + Ignore these files only + + + + Ignore files with these names, in any folder + + + + Ignore this file only + + + + Ignore files with the same name as this, in any folder + + + + Ignore the whole folder "%1" + + + + Ignore all files with these extensions: +%1 + + + + Ignore all files with the extension "%1" + + + + Please choose whether to: + + + + Ignore + + HgRunner @@ -215,7 +336,7 @@ There are %n change(s) ready to pull - + There is %n change ready to pull There are %n changes ready to pull @@ -253,8 +374,8 @@ 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. - - You are about to revert %n file. This will throw away any changes that you have made to these files but have not committed. + + You are about to revert %n file. This will throw away any changes that you have made to this file but have not committed. You are about to revert %n files. This will throw away any changes that you have made to these files but have not committed. @@ -363,10 +484,6 @@ - <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> - - - <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> @@ -378,17 +495,9 @@ <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> - - Ok - - - - Mercurial command did not return any output. - - Pushed %n changeset(s) - + Pushed %n changeset Pushed %n changesets @@ -403,7 +512,7 @@ Pulled %n changeset(s) - + Pulled %n changeset Pulled %n changesets @@ -454,7 +563,7 @@ You are about to commit %n file(s) to %1. - + You are about to commit %n file to %1. You are about to commit %n files to %1. @@ -485,7 +594,7 @@ At one of %n heads of %1 - + At one of %n heads of %1 At one of %n heads of %1 @@ -495,22 +604,10 @@ - Open... - - - - Settings... - - - View and change application settings - Refresh - - - Preview @@ -527,10 +624,6 @@ - Revert - - - Add @@ -539,34 +632,10 @@ - Commit - - - - Annotate - - - - Show line-by-line version information for selected file - - - - Serve local repository via http for workgroup access - - - File - Advanced - - - - Help - - - Ready @@ -579,10 +648,6 @@ - You are about to commit the following files to %1: - - - New Branch @@ -591,14 +656,6 @@ - Start Branch - - - - Add Tag - - - Note: you are reverting only the files you have selected, not all of the files that have been changed! @@ -627,10 +684,6 @@ - <qt>You are about to push your changes to the remote repository at <code>%1</code>.</qt> - - - Serve @@ -639,18 +692,6 @@ - Press Close to stop the server and return. - - - - Change Remote Location - - - - <qt><big>Change the remote location</big></qt> - - - Provide a new URL to use for push and pull actions from the current local repository. @@ -695,10 +736,6 @@ - The new changes will be highlighted in the history. Use Update to bring these changes into your working copy. - - - Your local repository already contains all changes found in the remote repository. @@ -727,10 +764,6 @@ - The Mercurial program either could not be found or failed to run. Check that the Mercurial program path is correct in %1. - - - Failed to run Mercurial with extension enabled @@ -747,10 +780,6 @@ - Clone successful - - - The remote repository was successfully cloned to the local folder <code>%1</code>. @@ -799,22 +828,6 @@ - Change Remote Location... - - - - Change the default remote repository for pull and push actions - - - - Quit - - - - Quit EasyMercurial - - - Refresh the window to show the current state of the working folder @@ -839,14 +852,6 @@ - Mark the selected file(s) to be added on the next commit - - - - Mark the selected file(s) to be removed from version control on the next commit - - - Update the working folder to the head of the current repository branch @@ -859,27 +864,348 @@ - Edit .hgignore File - - - Edit the .hgignore file, containing the names of files that should be ignored by Mercurial - Serve via HTTP - - - <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 © 2011 Queen Mary, University of London. Copyright © 2010 Jari Korhonen. Copyright © 2011 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. + + You are about to commit changes to the following files in %1: + + - Running temporary server at %n address(es): - - + You are about to commit changes to %n file(s) in %1. + + You are about to commit changes to %n file in %1. + You are about to commit changes to %n files in %1. + + Co&mmit + + + + Start &Branch + + + + Add &Tag + + + + <qt><h3>Ignored File Patterns</h3></qt> + + + + Write failed + + + + Failed to open file %1 for writing + + + + Ignored files + + + + The following lines have been added to the .hgignore file for this working copy: + + + + Re&vert + + + + Rename + + + + Rename <code>%1</code> to: + + + + Re&name + + + + Copy + + + + Copy <code>%1</code> to: + + + + Co&py + + + + &Pull + + + + Note: You have uncommitted changes. If you want to push these changes to the remote repository, you need to commit them first. + + + + <qt>You are about to push your commits to the remote repository at <code>%1</code>.%2</qt> + + + + &Push + + + + Sharing Repository + + + + Your local repository is now being made temporarily available via HTTP for workgroup access. + + + + Users who have network access to your computer can now clone your repository, by using one of the following URLs as a remote location: + + + + Users who have network access to your computer can now clone your repository, by using the following URL as a remote location: + + + + Press Close to terminate this server, end remote access, and return. + + + + Share Repository + + + + Set Remote Location + + + + <qt><big>Set the remote location</big></qt> + + + + 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. + + + + <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> + + + + New changes will be highlighted in yellow in the history. + + + + 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. + + + + Authorization failed + + + + 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. + + + + The Mercurial program either could not be found or failed to run. Check that the Mercurial program path is correct in %1. + + + + Merge failed + + + + 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. + + + + A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial. + + + + Newer Mercurial version required + + + + 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. + + + + Open successful + + + + No recent local repositories + + + + &Open... + + + + Ctrl+O + + + + Set Remote &Location... + + + + Set or change the default remote repository for pull and push actions + + + + &Settings... + + + + E&xit + + + + &Quit + + + + Exit EasyMercurial + + + + &Refresh + + + + Ctrl+R + + + + Pre&view Incoming Changes + + + + Pu&ll from Remote Repository + + + + Ctrl+L + + + + Pus&h to Remote Repository + + + + Ctrl+H + + + + &Diff + + + + Ctrl+D + + + + &Add Files + + + + + + + + + Mark the selected files to be added on the next commit + + + + &Remove Files + + + + Del + + + + Mark the selected files to be removed from version control on the next commit + + + + &Ignore Files... + + + + Add the selected filenames to the ignored list, of files that should never be tracked in this repository + + + + Edit Ignored List + + + + &Update to Branch Head + + + + Ctrl+U + + + + &Commit... + + + + Ctrl+Return + + + + &Merge + + + + Ctrl+M + + + + Serve local repository temporarily via HTTP for workgroup access + + + + &File + + + + Open Re&cent + + + + &Work + + + + &Remote + + + + &Help + + + + Remote + + + + Work + + MoreInformationDialog @@ -922,6 +1248,18 @@ &Folder: + + Documents + + + + My Documents + + + + Desktop + + QApplication @@ -1039,10 +1377,6 @@ - External text editor: - - - EasyHg Mercurial extension: @@ -1067,10 +1401,6 @@ - External text editor - - - EasyHg Mercurial extension @@ -1082,6 +1412,14 @@ <qt>Restore default settings? Are you sure you want to reset all settings to their default values? + + SSH program (for ssh URLs): + + + + SSH program + + StartupDialog @@ -1148,6 +1486,18 @@ Cancel new branch + + <qt> Uncommitted merge</qt> + + + + Uncommitted merge + + + + merge + + WorkStatusWidget