diff options
Diffstat (limited to 'org.eclipse.jgit.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 10 |
1 files changed, 10 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 718c57ad2e..98fbd7fbc4 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 @@ -19,9 +19,11 @@ cannotChekoutNoHeadsAdvertisedByRemote=cannot checkout; no HEAD advertised by re cannotCreateCommand=Cannot create command {0} cannotCreateOutputStream=cannot create output stream cannotDeatchHEAD=Cannot deatch HEAD +cannotDeleteFile=error: The following file could not be deleted: cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch '{0}' which you are currently on. cannotGuessLocalNameFrom=cannot guess local name from {0} cannotLock=Cannot lock {0} +cannotMergeDetachedHead=Cannot merge into detached HEAD cannotReadBecause=cannot read {0}: {1} cannotReadPackageInformation=Cannot read package information. cannotRenameDetachedHEAD=Cannot rename detached HEAD @@ -39,6 +41,7 @@ dateInfo=Date: {0} deletedBranch=Deleted branch {0} deletedRemoteBranch=Deleted remote branch {0} doesNotExist={0} does not exist +dontOverwriteLocalChanges=error: Your local changes to the following file would be overwritten by merge: everythingUpToDate=Everything up-to-date expectedNumberOfbytes=Expected {0} bytes. exporting=Exporting {0} @@ -54,6 +57,9 @@ initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported. jgitVersion=jgit version {0} listeningOn=Listening on {0} +mergeConflict=CONFLICT(content): Merge conflict in {0} +mergeFailed=Automatic merge failed; fix conflicts and then commit the result +mergeMadeBy=Merge made by {0} metaVar_DAG=DAG metaVar_KEY=KEY metaVar_arg=ARG @@ -115,6 +121,7 @@ noteObjectTooLargeToPrint=Note object {0} too large to print onlyOneMetaVarExpectedIn=Only one {0} expected in {1}. pushTo=To {0} pathsRequired=at least one path has to be specified when using --only +refDoesNotExistOrNoCommit={0} does not exist or is not referring to a commit remoteMessage=remote: {0} remoteRefObjectChangedIsNotExpectedOne=remote ref object changed - is not expected one {0} remoteSideDoesNotSupportDeletingRefs=remote side does not support deleting refs @@ -123,6 +130,7 @@ serviceNotSupported=Service '{0}' not supported skippingObject=skipping {0} {1} timeInMilliSeconds={0} ms tooManyRefsGiven=Too many refs given +unknownMergeStratey=unknown merge strategy {0} specified unsupportedOperation=Unsupported operation: {0} usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 service usage_CommitAuthor=Override the author name used in the commit. You can use the standard A U Thor <author@example.com> format. @@ -136,6 +144,7 @@ usage_DisplayTheVersionOfJgit=Display the version of jgit usage_IPZillaPassword=IPZilla Password usage_IPZillaURL=IPZilla URL usage_IPZillausername=IPZilla Username +usage_MergesTwoDevelopmentHistories=Merges two developement histories usage_RepositoryToReadFrom=Repository to read from usage_RepositoryToReceiveInto=Repository to receive into usage_ServerSideBackendForJgitFetch=Server side backend for 'jgit fetch' @@ -183,6 +192,7 @@ usage_inputOutputFile=Input/output file usage_listBothRemoteTrackingAndLocalBranches=list both remote-tracking and local branches usage_listCreateOrDeleteBranches=List, create, or delete branches usage_logAllPretty=format:%H %ct %P' output=log --all '--pretty=format:%H %ct %P' output +usage_mergeStrategy=Use the given merge strategy. Can be supplied more than once to specify them in the order they should be tried. If there is no -s option, the resolve strategy is used. Currently the following strategies are supported: ours, theirs, simple-two-way-in-core, resolve usage_moveRenameABranch=move/rename a branch usage_nameStatus=show only name and status of files usage_noPrefix=do not show any source or destination prefix |