diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-02-01 17:36:10 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-02-01 17:36:10 +0900 |
| commit | 9ce7e8e76703d0fe3ae398866f06bcee4f03b254 (patch) | |
| tree | 9607ccaf9dd3278933113fba0c4750de20d881de /org.eclipse.jgit/resources/org/eclipse | |
| parent | e72b2771a0b90fea4a0604a326a9dec7894bfff9 (diff) | |
| parent | 3d6455331d00fbc1fff8cfeec2e9429d998a9567 (diff) | |
| download | jgit-9ce7e8e76703d0fe3ae398866f06bcee4f03b254.tar.gz jgit-9ce7e8e76703d0fe3ae398866f06bcee4f03b254.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
Minor fixes in three error messages
Change-Id: Ibd6bcecb40a6d97c46c66360020dca7453876298
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 45032de9bd..45a6af3755 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -64,7 +64,7 @@ cannotCreateDirectory=Cannot create directory {0} cannotCreateHEAD=cannot create HEAD cannotCreateIndexfile=Cannot create an index file with name {0} cannotCreateTempDir=Cannot create a temp dir -cannotDeleteCheckedOutBranch=Branch {0} is checked out and can not be deleted +cannotDeleteCheckedOutBranch=Branch {0} is checked out and cannot be deleted cannotDeleteFile=Cannot delete file: {0} cannotDeleteObjectsPath=Cannot delete {0}/{1}: {2} cannotDeleteStaleTrackingRef=Cannot delete stale tracking ref {0} @@ -82,7 +82,7 @@ cannotListRefs=cannot list refs cannotLock=Cannot lock {0}. Ensure that no other process has an open file handle on the lock file {0}.lock, then you may delete the lock file and retry. cannotLockPackIn=Cannot lock pack in {0} cannotMatchOnEmptyString=Cannot match on empty string. -cannotMkdirObjectPath=Cannot mkdir {0}/{1}: {2} +cannotMkdirObjectPath=Cannot create directory {0}/{1}: {2} cannotMoveIndexTo=Cannot move index to {0} cannotMovePackTo=Cannot move pack to {0} cannotOpenService=cannot open {0} @@ -555,7 +555,7 @@ redirectsOff=Cannot redirect because http.followRedirects is false (HTTP status refAlreadyExists=already exists refAlreadyExists1=Ref {0} already exists reflogEntryNotFound=Entry {0} not found in reflog for ''{1}'' -refNotResolved=Ref {0} can not be resolved +refNotResolved=Ref {0} cannot be resolved refUpdateReturnCodeWas=RefUpdate return code was: {0} remoteConfigHasNoURIAssociated=Remote config "{0}" has no URIs associated remoteDoesNotHaveSpec=Remote does not have {0} available for fetch. |