diff options
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index 824ee80b2c..0291f5ce26 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties @@ -34,6 +34,8 @@ cannotUseObjectsWithGlog=Cannot use --objects with glog cannotWrite=Cannot write {0} cantFindGitDirectory=error: can't find git directory cantWrite=Can't write {0} +changesNotStagedForCommit=Changes not staged for commit: +changesToBeCommitted=Changes to be committed: commitLabel=commit configFileNotFound=configuration file {0} not found conflictingUsageOf_git_dir_andArguments=conflicting usage of --git-dir and arguments @@ -58,6 +60,7 @@ fromURI=From {0} initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported. jgitVersion=jgit version {0} +lineFormat=# {0} listeningOn=Listening on {0} mergeConflict=CONFLICT(content): Merge conflict in {0} mergeFailed=Automatic merge failed; fix conflicts and then commit the result @@ -123,6 +126,8 @@ notAnIndexFile={0} is not an index file notAnObject={0} is not an object notFound=!! NOT FOUND !! noteObjectTooLargeToPrint=Note object {0} too large to print +notOnAnyBranch=Not currently on any branch. +onBranch=On branch {0} onBranchToBeBorn=You are on a branch yet to be born onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. onlyOneOfIncludeOnlyAllInteractiveCanBeUsed=Only one of --include/--only/--all/--interactive can be used. @@ -136,6 +141,11 @@ remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs repaint=Repaint serviceNotSupported=Service '{0}' not supported skippingObject=skipping {0} {1} +statusFileListFormat=\t%1$s +statusFileListFormatWithPrefix=\t%1$-11s %2$s +statusModified=modified: +statusNewFile=new file: +statusRemoved=deleted: switchedToNewBranch=Switched to a new branch ''{0}'' switchedToBranch=Switched to branch ''{0}'' tagLabel=tag @@ -143,7 +153,9 @@ taggerInfo=Tagger: {0} <{1}> timeInMilliSeconds={0} ms tooManyRefsGiven=Too many refs given unknownMergeStrategy=unknown merge strategy {0} specified +unmergedPaths=Unmerged paths: unsupportedOperation=Unsupported operation: {0} +untrackedFiles=Untracked files: usage_Blame=Show what revision and author last modified each line usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service usage_CommitAll=commit all modified and deleted files @@ -165,6 +177,7 @@ usage_RepositoryToReceiveInto=Repository to receive into usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch' usage_ServerSideBackendForJgitPush=Server side backend for 'jgit push' usage_ShowDiffs=Show diffs +usage_Status=Show the working tree status usage_StopTrackingAFile=Stop tracking a file usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs usage_abbrevCommits=abbreviate commits to N + 1 digits |