diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index 79d83d3cee56..8a981d534303 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -40,7 +40,7 @@ checkout.validation.failed=Source revision validation failed clone.button=Clone clone.destination.directory.description=Select a parent directory destination directory for clone clone.destination.directory.title=Parent Directory -clone.destination.exists.error=The path {0} exists. The Git cannot clone to existing directory. +clone.destination.exists.error=The path {0} exists. Git cannot clone to an existing directory. clone.dir.name=Directory &Name clone.invalid.origin=The origin name is in invalid format. clone.invalid.url=Repository URL is a malformed URL or non-existent directory. @@ -100,7 +100,7 @@ error.dialog.title=Error error.list.title={0} Error: error.occurred.during=Error occurred during ''{0}'' errors.message.item=\n {0} -errors.message=The git operation ended with multiple errors:{0} +errors.message=The Git operation ended with multiple errors:{0} fetch.action.name=Fetch fetch.button=Fetch fetch.force.references.update.tooltip=Forces update of branch references for which update is not forced in reference mapping. @@ -115,8 +115,8 @@ fetch.tags.tooltip=Select fetched commits policy\ - Note that this setting has nothing common with git autocrlf and other git settings.\ + Note that this setting has nothing common with Git autocrlf and other Git settings.\ -git.vcs.config.path.label=Path to &git executable: +git.vcs.config.path.label=Path to &Git executable: git.vcs.config.ssh.mode.idea=ssh git.vcs.config.ssh.mode.native=Native -git.vcs.config.ssh.mode.tooltip=Specify which version of SSH to be used with git.The native implementation might cause hangups on some platforms. In native case, you also might need to configure ssh-askpass for your platform to recieve GUI prompts for passwords. +git.vcs.config.ssh.mode.tooltip=Specify which version of SSH to be used with Git.The native implementation might cause hangups on some platforms. In native case, you also might need to configure ssh-askpass for your platform to receive GUI prompts for passwords. git.vcs.config.ssh.mode=&SSH Executable: git.vcs.config.test.label=Test git.vcs.config.test=&Test @@ -157,7 +157,7 @@ init.add.root.message=Do you want to add this directory as a VCS root? init.add.root.title=Git Init init.destination.directory.description=Select directory where the new Git repository will be created. init.destination.directory.title=Select directory for git init -init.warning.already.under.git=The selected directory {0} is already under git.
Are you sure that you want to create a new vcs root? +init.warning.already.under.git=The selected directory {0} is already under Git.
Are you sure that you want to create a new VCS root? init.warning.title=Git Init initializing.title=Initializing repository... merge.action.name=Merge @@ -258,7 +258,7 @@ pushing.all.changes=Pushing all committed changes, refs & tags to remote reposit gc.action.name=Run Garbage Collector rebase.abort.action.name=Abort Rebasing rebase.action.error=Git Rebase Error -rebase.action.message=Multiple git roots have unfinished rebase process, please select root to perform action on. +rebase.action.message=Multiple Git roots have unfinished rebase process, please select root to perform action on. rebase.action.name=Rebase rebase.action.no.root=There is no rebase operation in progress in the project rebase.branch.tooltip=Select branch to rebase (if branch is different from the current branch, it will be checked out first) @@ -281,7 +281,7 @@ rebase.editor.view.tooltip=View commit contents rebase.editor.view=&View rebase.from.tooltip=Specify actual base for the branch. Leave blank to onto. rebase.from=&From: -rebase.in.progress=Interactive rebase has been already started for this git root. +rebase.in.progress=Interactive rebase has been already started for this Git root. rebase.interactive.tooltip=If selected, the interactive rebase will be preformed. rebase.interactive=&Interactive rebase.invalid.from=\"From\" reference expression is invalid. @@ -337,9 +337,9 @@ refspec.validation.remote.invalid=The invalid local name for remote refspec.validation.remote.is.blank=The local name for remote is blank regase.show.tags=Show &tags remove.removing=Removing files... -repository.action.missing.roots.misconfigured=Neither of configured git roots are is under git. The configured directory or some of its ancestors must have ".git" directory in it. -repository.action.missing.roots.title=No git roots -repository.action.missing.roots.unconfigured.message=No git roots are configured for the project. +repository.action.missing.roots.misconfigured=None of configured Git roots are under Git. The configured directory or some of its ancestors must have ".git" directory in it. +repository.action.missing.roots.title=No Git roots +repository.action.missing.roots.unconfigured.message=No Git roots are configured for the project. reset.action.name=Reset Head ... reset.button=Reset reset.commit.invalid=The specified commit expression did not pass validation. @@ -358,8 +358,8 @@ revert.action.name=Revert revert.reverting.mulitple=Reverting {0} files revert.reverting=Reverting files... revision.graph=RevisionGraph -root.tracker.message.title=Invalid Git roots -root.tracker.message=

Some configured Git VCS roots are not under Git or have Git repositories in subdirectories without configured VCS root. Configure.

+root.tracker.message.title=Invalid Git Roots +root.tracker.message=

Some configured Git VCS roots are not under Git or have Git repositories in subdirectories without a configured VCS root. Configure.

select.branch.to.checkout=Select branch to checkout show.all.paths.affected.action.name=Show All Affected Paths ssh.ask.passphrase.title=SSH Key Passphrase @@ -453,11 +453,11 @@ update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored w update.options.save.shelve=Using She&lve update.options.save.stash.tooltip=Use 'git stash' to save changes (the files will be restored when update finishes) update.options.save.stash=Using S&tash -update.options.type.default.tooltip=Use branch default update strategy for all updated git vcs roots +update.options.type.default.tooltip=Use branch default update strategy for all updated Git VCS roots update.options.type.default=Branch &Default -update.options.type.merge.tooltip=Use merge update strategy for all git vcs roots +update.options.type.merge.tooltip=Use merge update strategy for all Git VCS roots update.options.type.merge=&Merge -update.options.type.rebase.tooltip=Use rebase update strategy for all git vcs roots +update.options.type.rebase.tooltip=Use rebase update strategy for all Git VCS roots update.options.type.rebase=&Rebase update.options.type=Update Type update.rebase.no.change.cancel=Cancel Update @@ -479,14 +479,14 @@ util.remote.renderer.none=None util.remote.renderer.normal={0}({1}) util.remote.renderer.self=Current repository vcs.unable.to.run.git=Unable to run git: {0} ({1}) -vcs.unsupported.version=Unsupported version of git configured: {0}. The minimal supported version is {1} -vfs.listener.add.single.prompt=Do you want to add the following file to Git?\n{0}\n\nIf you say NO, you can still add it later manually. -vfs.listener.add.single.title=Add file to Git -vfs.listener.add.title=Add files to Git +vcs.unsupported.version=Unsupported version of Git configured: {0}. The minimal supported version is {1} +vfs.listener.add.single.prompt=Do you want to add the following file to Git?\n{0}\n\nIf you say No, you can still add it later manually. +vfs.listener.add.single.title=Add File to Git +vfs.listener.add.title=Add Files to Git vfs.listener.checking.ignored=Checking for ignored files -vfs.listener.delete.single.prompt=Do you want to delete the following file from Git?\n{0}\n\nIf you say NO, you can still delete it later manually. -vfs.listener.delete.single.title=Delete file from Git -vfs.listener.delete.title=Delete files from Git +vfs.listener.delete.single.prompt=Do you want to delete the following file from Git?\n{0}\n\nIf you say No, you can still delete it later manually. +vfs.listener.delete.single.title=Delete File from Git +vfs.listener.delete.title=Delete Files from Git general.error = Git error executable.error.title = Git executable problem @@ -498,10 +498,10 @@ git.commit.message.empty.title=Commit message is empty git.executable.notification.title=Git executable problem git.executable.notification.description=Git couldn't be started. Probably the path to Git executable is not valid. Fix it. git.executable.dialog.title=Git executable -git.executable.dialog.description=Specify the full path to git executable -git.executable.dialog.error=It doesn't appear to be a valid git executable +git.executable.dialog.description=Specify the full path to Git executable +git.executable.dialog.error=It doesn't appear to be a valid Git executable git.executable.filechooser.title=Git executable -git.executable.filechooser.description=Specify the full path to git executable +git.executable.filechooser.description=Specify the full path to Git executable git.push.active.close=Close