motiejus
/
jgit
1
Fork 0
Code Releases Activity

Replace "Checkout" by "Check out" when used as a verb 

One occurrence in core JGit, several in jgit.pgm. One unused
occurrence in jgit.pgm; remove it.

Change-Id: I04c3dd9d9f542f1e1ac6df4cbf03bcefb6bfdf78
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
Thomas Wolf 2019-03-15 21:07:42 +01:00
parent 23c3702686
commit d9d9862402
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
View File

@ -24,7 +24,6 @@ branchNameRequired=branch name required
branchNotFound=branch ''{0}'' not found. branchNotFound=branch ''{0}'' not found.
cacheTreePathInfo="{0}": {1} entries, {2} children cacheTreePathInfo="{0}": {1} entries, {2} children
cannotBeRenamed={0} cannot be renamed cannotBeRenamed={0} cannot be renamed
cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by remote
cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff. cannotCombineSquashWithNoff=You cannot combine --squash with --no-ff.
cannotCreateCommand=Cannot create command {0} cannotCreateCommand=Cannot create command {0}
cannotCreateOutputStream=cannot create output stream cannotCreateOutputStream=cannot create output stream
@ -315,7 +314,7 @@ usage_blameSuppressAuthor=do not show author name and timestamp
usage_beMoreVerbose=be more verbose usage_beMoreVerbose=be more verbose
usage_beVerbose=be verbose usage_beVerbose=be verbose
usage_cached=compare against index usage_cached=compare against index
usage_checkout=Checkout a branch to the working tree usage_checkout=Check out a branch to the working tree
usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory usage_cloneRepositoryIntoNewDir=Clone a repository into a new directory
usage_configFile=configuration file usage_configFile=configuration file
usage_configGlobal=use global configuration in ~/.gitconfig usage_configGlobal=use global configuration in ~/.gitconfig
@ -323,7 +322,7 @@ usage_configList=List all variables set in config file
usage_configLocal=use local configuration in .git/config usage_configLocal=use local configuration in .git/config
usage_configSystem=use system-wide configuration in $(prefix)/etc/gitconfig usage_configSystem=use system-wide configuration in $(prefix)/etc/gitconfig
usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename usage_configureTheServiceInDaemonServicename=configure the service in daemon.servicename
usage_createBranchAndCheckout=create branch and checkout usage_createBranchAndCheckout=create branch and check out
usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged) usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged)
usage_deleteFullyMergedBranch=delete fully merged branch usage_deleteFullyMergedBranch=delete fully merged branch
usage_date=date format, one of default, rfc, local, iso, short, raw (as defined by git-log(1) ), locale or localelocal (jgit extensions) usage_date=date format, one of default, rfc, local, iso, short, raw (as defined by git-log(1) ), locale or localelocal (jgit extensions)
@ -416,7 +415,7 @@ usage_untrackedFilesMode=show untracked files
usage_updateRef=reference to update usage_updateRef=reference to update
usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository
usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream usage_useNameInsteadOfOriginToTrackUpstream=use <name> instead of 'origin' to track upstream
usage_checkoutBranchAfterClone=checkout named branch instead of remote's HEAD usage_checkoutBranchAfterClone=check out named branch instead of remote's HEAD
usage_viewCommitHistory=View commit history usage_viewCommitHistory=View commit history
usage_orphan=Create a new orphan branch. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from other branches and commits. usage_orphan=Create a new orphan branch. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from other branches and commits.
usernameFor=Username for {0}: usernameFor=Username for {0}:

1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java
View File

@ -138,7 +138,6 @@ public static String fatalError(String message) {
/***/ public String cacheTreePathInfo; /***/ public String cacheTreePathInfo;
/***/ public String configFileNotFound; /***/ public String configFileNotFound;
/***/ public String cannotBeRenamed; /***/ public String cannotBeRenamed;
/***/ public String cannotChekoutNoHeadsAdvertisedByRemote;
/***/ public String cannotCombineSquashWithNoff; /***/ public String cannotCombineSquashWithNoff;
/***/ public String cannotCreateCommand; /***/ public String cannotCreateCommand;
/***/ public String cannotCreateOutputStream; /***/ public String cannotCreateOutputStream;

2
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -54,7 +54,7 @@ cannotBeCombined=Cannot be combined.
cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included. cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included.
cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}. cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}.
cannotChangeToComment=Cannot change a non-comment line to a comment line. cannotChangeToComment=Cannot change a non-comment line to a comment line.
cannotCheckoutFromUnbornBranch=Cannot checkout from unborn branch cannotCheckoutFromUnbornBranch=Cannot check out from unborn branch
cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches. cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches.
cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff. cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}. cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.