Merge branch 'stable-5.1' into stable-5.2
* stable-5.1: Bazel: Fix warning about deprecated lib.bzl Format lib/BUILD with buildifier Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Bazel: Bump minimum supported version to 0.29.0 Bazel: Bump skylib library version to 0.8.0 Use bazelisk to switch between used bazel version Bazel: Require minimum bazel version 0.17.1 Fix wrong placeholder index in error message packInaccessible JGitText: Remove unused externalized strings RepoText: Remove unused externalized string CLI: Remove unused externalized strings Change-Id: Iea37a8e39e9d4872dc607c9222dcf191ce4e4757 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
38198972d4
|
@ -0,0 +1 @@
|
||||||
|
0.29.0
|
|
@ -4,14 +4,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "bazel_skylib",
|
name = "bazel_skylib",
|
||||||
sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d",
|
sha256 = "2ea8a5ed2b448baf4a6855d3ce049c4c452a6470b1efd1504fdb7c1c134d220a",
|
||||||
strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b",
|
strip_prefix = "bazel-skylib-0.8.0",
|
||||||
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"],
|
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/0.8.0.tar.gz"],
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@bazel_skylib//lib:versions.bzl", "versions")
|
load("@bazel_skylib//lib:versions.bzl", "versions")
|
||||||
|
|
||||||
versions.check(minimum_bazel_version = "0.19.0")
|
versions.check(minimum_bazel_version = "0.29.0")
|
||||||
|
|
||||||
load("//tools:bazlets.bzl", "load_bazlets")
|
load("//tools:bazlets.bzl", "load_bazlets")
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "args4j",
|
name = "args4j",
|
||||||
visibility = [
|
visibility = [
|
||||||
|
@ -162,13 +164,13 @@ java_library(
|
||||||
testonly = 1,
|
testonly = 1,
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
exports = [
|
exports = [
|
||||||
"@bytebuddy//jar",
|
|
||||||
"@bytebuddy-agent//jar",
|
"@bytebuddy-agent//jar",
|
||||||
|
"@bytebuddy//jar",
|
||||||
"@hamcrest-core//jar",
|
"@hamcrest-core//jar",
|
||||||
"@hamcrest-library//jar",
|
"@hamcrest-library//jar",
|
||||||
"@junit//jar",
|
"@junit//jar",
|
||||||
"@mockito//jar",
|
"@mockito//jar",
|
||||||
"@objenesis//jar"
|
"@objenesis//jar",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
load(
|
load(
|
||||||
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
||||||
"junit_tests",
|
"junit_tests",
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
load(
|
load(
|
||||||
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
||||||
"junit_tests",
|
"junit_tests",
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
load(
|
load(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
load(
|
load(
|
||||||
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
|
||||||
"junit_tests",
|
"junit_tests",
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
name = "pgm",
|
name = "pgm",
|
||||||
srcs = glob(["src/**/*.java"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
|
|
|
@ -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
|
||||||
|
@ -33,7 +32,6 @@ cannotDeleteFile=error: The following file could not be deleted:
|
||||||
cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on.
|
cannotDeleteTheBranchWhichYouAreCurrentlyOn=Cannot delete the branch ''{0}'' which you are currently on.
|
||||||
cannotGuessLocalNameFrom=cannot guess local name from {0}
|
cannotGuessLocalNameFrom=cannot guess local name from {0}
|
||||||
cannotLock=Cannot lock {0}
|
cannotLock=Cannot lock {0}
|
||||||
cannotMergeDetachedHead=Cannot merge into detached HEAD
|
|
||||||
cannotReadBecause=cannot read {0}: {1}
|
cannotReadBecause=cannot read {0}: {1}
|
||||||
cannotReadPackageInformation=Cannot read package information.
|
cannotReadPackageInformation=Cannot read package information.
|
||||||
cannotRenameDetachedHEAD=Cannot rename detached HEAD
|
cannotRenameDetachedHEAD=Cannot rename detached HEAD
|
||||||
|
@ -64,7 +62,6 @@ expectedNumberOfbytes=Expected {0} bytes.
|
||||||
exporting=Exporting {0}
|
exporting=Exporting {0}
|
||||||
failedToCommitIndex=failed to commit index
|
failedToCommitIndex=failed to commit index
|
||||||
failedToLockIndex=failed to lock index
|
failedToLockIndex=failed to lock index
|
||||||
failedToLockTag=Failed to lock tag {0}: {1}
|
|
||||||
fatalError=fatal: {0}
|
fatalError=fatal: {0}
|
||||||
fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal:
|
fatalThisProgramWillDestroyTheRepository=fatal: This program will destroy the repository\nfatal:\nfatal:\nfatal: {0}\nfatal:\nfatal: To continue, add {1} to the command line\nfatal:
|
||||||
fetchingSubmodule=Fetching submodule {0}
|
fetchingSubmodule=Fetching submodule {0}
|
||||||
|
@ -154,7 +151,6 @@ needSingleRevision=Needed a single revision
|
||||||
noGitRepositoryConfigured=No Git repository configured.
|
noGitRepositoryConfigured=No Git repository configured.
|
||||||
noNamesFound=No names found, cannot describe anything.
|
noNamesFound=No names found, cannot describe anything.
|
||||||
noSuchFile=no such file: {0}
|
noSuchFile=no such file: {0}
|
||||||
noSuchRemoteRef=no such remote ref: ''{0}''
|
|
||||||
noSystemConsoleAvailable=No System.console available
|
noSystemConsoleAvailable=No System.console available
|
||||||
noTREESectionInIndex=no 'TREE' section in index
|
noTREESectionInIndex=no 'TREE' section in index
|
||||||
nonFastForward=non-fast forward
|
nonFastForward=non-fast forward
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -147,7 +146,6 @@ public static String fatalError(String message) {
|
||||||
/***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn;
|
/***/ public String cannotDeleteTheBranchWhichYouAreCurrentlyOn;
|
||||||
/***/ public String cannotGuessLocalNameFrom;
|
/***/ public String cannotGuessLocalNameFrom;
|
||||||
/***/ public String cannotLock;
|
/***/ public String cannotLock;
|
||||||
/***/ public String cannotMergeDetachedHead;
|
|
||||||
/***/ public String cannotReadBecause;
|
/***/ public String cannotReadBecause;
|
||||||
/***/ public String cannotReadPackageInformation;
|
/***/ public String cannotReadPackageInformation;
|
||||||
/***/ public String cannotRenameDetachedHEAD;
|
/***/ public String cannotRenameDetachedHEAD;
|
||||||
|
@ -177,7 +175,6 @@ public static String fatalError(String message) {
|
||||||
/***/ public String exporting;
|
/***/ public String exporting;
|
||||||
/***/ public String failedToCommitIndex;
|
/***/ public String failedToCommitIndex;
|
||||||
/***/ public String failedToLockIndex;
|
/***/ public String failedToLockIndex;
|
||||||
/***/ public String failedToLockTag;
|
|
||||||
/***/ public String fatalError;
|
/***/ public String fatalError;
|
||||||
/***/ public String fatalThisProgramWillDestroyTheRepository;
|
/***/ public String fatalThisProgramWillDestroyTheRepository;
|
||||||
/***/ public String fetchingSubmodule;
|
/***/ public String fetchingSubmodule;
|
||||||
|
@ -257,7 +254,6 @@ public static String fatalError(String message) {
|
||||||
/***/ public String noGitRepositoryConfigured;
|
/***/ public String noGitRepositoryConfigured;
|
||||||
/***/ public String noNamesFound;
|
/***/ public String noNamesFound;
|
||||||
/***/ public String noSuchFile;
|
/***/ public String noSuchFile;
|
||||||
/***/ public String noSuchRemoteRef;
|
|
||||||
/***/ public String noTREESectionInIndex;
|
/***/ public String noTREESectionInIndex;
|
||||||
/***/ public String nonFastForward;
|
/***/ public String nonFastForward;
|
||||||
/***/ public String noSystemConsoleAvailable;
|
/***/ public String noSystemConsoleAvailable;
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_import", "java_library")
|
||||||
load(":tests.bzl", "tests")
|
load(":tests.bzl", "tests")
|
||||||
load(
|
load(
|
||||||
"@com_googlesource_gerrit_bazlets//tools:genrule2.bzl",
|
"@com_googlesource_gerrit_bazlets//tools:genrule2.bzl",
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
load("@rules_java//java:defs.bzl", "java_library")
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
INSECURE_CIPHER_FACTORY = [
|
INSECURE_CIPHER_FACTORY = [
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
copyFileFailed=Error occurred during execution of copyfile rule.
|
|
||||||
errorIncludeFile=Error: unable to read include file {0}
|
errorIncludeFile=Error: unable to read include file {0}
|
||||||
errorIncludeNotImplemented=Error: <include> tag not supported as no callback defined.
|
errorIncludeNotImplemented=Error: <include> tag not supported as no callback defined.
|
||||||
errorNoDefault=Error: no default remote in manifest file.
|
errorNoDefault=Error: no default remote in manifest file.
|
||||||
|
|
|
@ -35,13 +35,10 @@ badRef=Bad ref: {0}: {1}
|
||||||
badSectionEntry=Bad section entry: {0}
|
badSectionEntry=Bad section entry: {0}
|
||||||
badShallowLine=Bad shallow line: {0}
|
badShallowLine=Bad shallow line: {0}
|
||||||
bareRepositoryNoWorkdirAndIndex=Bare Repository has neither a working tree, nor an index
|
bareRepositoryNoWorkdirAndIndex=Bare Repository has neither a working tree, nor an index
|
||||||
base64InputNotProperlyPadded=Base64 input not properly padded.
|
|
||||||
baseLengthIncorrect=base length incorrect
|
baseLengthIncorrect=base length incorrect
|
||||||
bitmapMissingObject=Bitmap at {0} is missing {1}.
|
bitmapMissingObject=Bitmap at {0} is missing {1}.
|
||||||
bitmapsMustBePrepared=Bitmaps must be prepared before they may be written.
|
bitmapsMustBePrepared=Bitmaps must be prepared before they may be written.
|
||||||
blameNotCommittedYet=Not Committed Yet
|
blameNotCommittedYet=Not Committed Yet
|
||||||
blobNotFound=Blob not found: {0}
|
|
||||||
blobNotFoundForPath=Blob not found: {0} for path: {1}
|
|
||||||
blockLimitNotMultipleOfBlockSize=blockLimit {0} must be a multiple of blockSize {1}
|
blockLimitNotMultipleOfBlockSize=blockLimit {0} must be a multiple of blockSize {1}
|
||||||
blockLimitNotPositive=blockLimit must be positive: {0}
|
blockLimitNotPositive=blockLimit must be positive: {0}
|
||||||
blockSizeNotPowerOf2=blockSize must be a power of 2
|
blockSizeNotPowerOf2=blockSize must be a power of 2
|
||||||
|
@ -54,7 +51,6 @@ cannotAccessLastModifiedForSafeDeletion=Unable to access lastModifiedTime of fil
|
||||||
cannotBeCombined=Cannot be combined.
|
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.
|
|
||||||
cannotCheckoutFromUnbornBranch=Cannot checkout from unborn branch
|
cannotCheckoutFromUnbornBranch=Cannot checkout 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.
|
||||||
|
@ -71,8 +67,6 @@ cannotCreateTempDir=Cannot create a temp dir
|
||||||
cannotDeleteCheckedOutBranch=Branch {0} is checked out and cannot be deleted
|
cannotDeleteCheckedOutBranch=Branch {0} is checked out and cannot be deleted
|
||||||
cannotDeleteFile=Cannot delete file: {0}
|
cannotDeleteFile=Cannot delete file: {0}
|
||||||
cannotDeleteObjectsPath=Cannot delete {0}/{1}: {2}
|
cannotDeleteObjectsPath=Cannot delete {0}/{1}: {2}
|
||||||
cannotDeleteStaleTrackingRef=Cannot delete stale tracking ref {0}
|
|
||||||
cannotDeleteStaleTrackingRef2=Cannot delete stale tracking ref {0}: {1}
|
|
||||||
cannotDetermineProxyFor=Cannot determine proxy for {0}
|
cannotDetermineProxyFor=Cannot determine proxy for {0}
|
||||||
cannotDownload=Cannot download {0}
|
cannotDownload=Cannot download {0}
|
||||||
cannotEnterObjectsPath=Cannot enter {0}/objects: {1}
|
cannotEnterObjectsPath=Cannot enter {0}/objects: {1}
|
||||||
|
@ -104,20 +98,16 @@ cannotReadObject=Cannot read object
|
||||||
cannotReadObjectsPath=Cannot read {0}/{1}: {2}
|
cannotReadObjectsPath=Cannot read {0}/{1}: {2}
|
||||||
cannotReadTree=Cannot read tree {0}
|
cannotReadTree=Cannot read tree {0}
|
||||||
cannotRebaseWithoutCurrentHead=Can not rebase without a current HEAD
|
cannotRebaseWithoutCurrentHead=Can not rebase without a current HEAD
|
||||||
cannotResolveLocalTrackingRefForUpdating=Cannot resolve local tracking ref {0} for updating.
|
|
||||||
cannotSaveConfig=Cannot save config file ''{0}''
|
cannotSaveConfig=Cannot save config file ''{0}''
|
||||||
cannotSquashFixupWithoutPreviousCommit=Cannot {0} without previous commit.
|
cannotSquashFixupWithoutPreviousCommit=Cannot {0} without previous commit.
|
||||||
cannotStoreObjects=cannot store objects
|
cannotStoreObjects=cannot store objects
|
||||||
cannotResolveUniquelyAbbrevObjectId=Could not resolve uniquely the abbreviated object ID
|
cannotResolveUniquelyAbbrevObjectId=Could not resolve uniquely the abbreviated object ID
|
||||||
cannotUnloadAModifiedTree=Cannot unload a modified tree.
|
|
||||||
cannotUpdateUnbornBranch=Cannot update unborn branch
|
cannotUpdateUnbornBranch=Cannot update unborn branch
|
||||||
cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index.
|
|
||||||
cannotWriteObjectsPath=Cannot write {0}/{1}: {2}
|
cannotWriteObjectsPath=Cannot write {0}/{1}: {2}
|
||||||
canOnlyCherryPickCommitsWithOneParent=Cannot cherry-pick commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported.
|
canOnlyCherryPickCommitsWithOneParent=Cannot cherry-pick commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported.
|
||||||
canOnlyRevertCommitsWithOneParent=Cannot revert commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported
|
canOnlyRevertCommitsWithOneParent=Cannot revert commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported
|
||||||
commitDoesNotHaveGivenParent=The commit ''{0}'' does not have a parent number {1}.
|
commitDoesNotHaveGivenParent=The commit ''{0}'' does not have a parent number {1}.
|
||||||
cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can''t find object in (reverse) pack index for the specified offset {0}
|
cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can''t find object in (reverse) pack index for the specified offset {0}
|
||||||
cantPassMeATree=Can't pass me a tree!
|
|
||||||
channelMustBeInRange1_255=channel {0} must be in range [1, 255]
|
channelMustBeInRange1_255=channel {0} must be in range [1, 255]
|
||||||
characterClassIsNotSupported=The character class {0} is not supported.
|
characterClassIsNotSupported=The character class {0} is not supported.
|
||||||
checkingOutFiles=Checking out files
|
checkingOutFiles=Checking out files
|
||||||
|
@ -132,7 +122,6 @@ collisionOn=Collision on {0}
|
||||||
commandClosedStderrButDidntExit=Command {0} closed stderr stream but didn''t exit within timeout {1} seconds
|
commandClosedStderrButDidntExit=Command {0} closed stderr stream but didn''t exit within timeout {1} seconds
|
||||||
commandRejectedByHook=Rejected by "{0}" hook.\n{1}
|
commandRejectedByHook=Rejected by "{0}" hook.\n{1}
|
||||||
commandWasCalledInTheWrongState=Command {0} was called in the wrong state
|
commandWasCalledInTheWrongState=Command {0} was called in the wrong state
|
||||||
commitAlreadyExists=exists {0}
|
|
||||||
commitMessageNotSpecified=commit message not specified
|
commitMessageNotSpecified=commit message not specified
|
||||||
commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported
|
commitOnRepoWithoutHEADCurrentlyNotSupported=Commit on repo without HEAD currently not supported
|
||||||
commitAmendOnInitialNotPossible=Amending is not possible on initial commit.
|
commitAmendOnInitialNotPossible=Amending is not possible on initial commit.
|
||||||
|
@ -148,14 +137,11 @@ corruptionDetectedReReadingAt=Corruption detected re-reading at {0}
|
||||||
corruptObjectBadDate=bad date
|
corruptObjectBadDate=bad date
|
||||||
corruptObjectBadEmail=bad email
|
corruptObjectBadEmail=bad email
|
||||||
corruptObjectBadStream=bad stream
|
corruptObjectBadStream=bad stream
|
||||||
corruptObjectBadStreamCorruptHeader=bad stream, corrupt header
|
|
||||||
corruptObjectBadTimezone=bad time zone
|
corruptObjectBadTimezone=bad time zone
|
||||||
corruptObjectDuplicateEntryNames=duplicate entry names
|
corruptObjectDuplicateEntryNames=duplicate entry names
|
||||||
corruptObjectGarbageAfterSize=garbage after size
|
corruptObjectGarbageAfterSize=garbage after size
|
||||||
corruptObjectIncorrectLength=incorrect length
|
corruptObjectIncorrectLength=incorrect length
|
||||||
corruptObjectIncorrectSorting=incorrectly sorted
|
corruptObjectIncorrectSorting=incorrectly sorted
|
||||||
corruptObjectInvalidEntryMode=invalid entry mode
|
|
||||||
corruptObjectInvalidMode=invalid mode
|
|
||||||
corruptObjectInvalidModeChar=invalid mode character
|
corruptObjectInvalidModeChar=invalid mode character
|
||||||
corruptObjectInvalidModeStartsZero=mode starts with '0'
|
corruptObjectInvalidModeStartsZero=mode starts with '0'
|
||||||
corruptObjectInvalidMode2=invalid mode {0,number,#}
|
corruptObjectInvalidMode2=invalid mode {0,number,#}
|
||||||
|
@ -175,7 +161,6 @@ corruptObjectInvalidParent=invalid parent
|
||||||
corruptObjectInvalidTree=invalid tree
|
corruptObjectInvalidTree=invalid tree
|
||||||
corruptObjectInvalidType=invalid type
|
corruptObjectInvalidType=invalid type
|
||||||
corruptObjectInvalidType2=invalid type {0}
|
corruptObjectInvalidType2=invalid type {0}
|
||||||
corruptObjectMalformedHeader=malformed header: {0}
|
|
||||||
corruptObjectMissingEmail=missing email
|
corruptObjectMissingEmail=missing email
|
||||||
corruptObjectNameContainsByte=name contains byte 0x%x
|
corruptObjectNameContainsByte=name contains byte 0x%x
|
||||||
corruptObjectNameContainsChar=name contains '%c'
|
corruptObjectNameContainsChar=name contains '%c'
|
||||||
|
@ -188,15 +173,9 @@ corruptObjectNegativeSize=negative size
|
||||||
corruptObjectNoAuthor=no author
|
corruptObjectNoAuthor=no author
|
||||||
corruptObjectNoCommitter=no committer
|
corruptObjectNoCommitter=no committer
|
||||||
corruptObjectNoHeader=no header
|
corruptObjectNoHeader=no header
|
||||||
corruptObjectNoObject=no object
|
|
||||||
corruptObjectNoObjectHeader=no object header
|
corruptObjectNoObjectHeader=no object header
|
||||||
corruptObjectNoTaggerBadHeader=no tagger/bad header
|
|
||||||
corruptObjectNoTaggerHeader=no tagger header
|
|
||||||
corruptObjectNoTagHeader=no tag header
|
corruptObjectNoTagHeader=no tag header
|
||||||
corruptObjectNoTagName=no tag name
|
|
||||||
corruptObjectNotree=no tree
|
|
||||||
corruptObjectNotreeHeader=no tree header
|
corruptObjectNotreeHeader=no tree header
|
||||||
corruptObjectNoType=no type
|
|
||||||
corruptObjectNoTypeHeader=no type header
|
corruptObjectNoTypeHeader=no type header
|
||||||
corruptObjectPackfileChecksumIncorrect=Packfile checksum incorrect.
|
corruptObjectPackfileChecksumIncorrect=Packfile checksum incorrect.
|
||||||
corruptObjectTruncatedInMode=truncated in mode
|
corruptObjectTruncatedInMode=truncated in mode
|
||||||
|
@ -204,20 +183,12 @@ corruptObjectTruncatedInName=truncated in name
|
||||||
corruptObjectTruncatedInObjectId=truncated in object id
|
corruptObjectTruncatedInObjectId=truncated in object id
|
||||||
corruptObjectZeroId=entry points to null SHA-1
|
corruptObjectZeroId=entry points to null SHA-1
|
||||||
corruptUseCnt=close() called when useCnt is already zero for {0}
|
corruptUseCnt=close() called when useCnt is already zero for {0}
|
||||||
couldNotCheckOutBecauseOfConflicts=Could not check out because of conflicts
|
|
||||||
couldNotDeleteLockFileShouldNotHappen=Could not delete lock file. Should not happen
|
|
||||||
couldNotDeleteTemporaryIndexFileShouldNotHappen=Could not delete temporary index file. Should not happen
|
|
||||||
couldNotGetAdvertisedRef=Remote {0} did not advertise Ref for branch {1}. This Ref may not exist in the remote or may be hidden by permission settings.
|
couldNotGetAdvertisedRef=Remote {0} did not advertise Ref for branch {1}. This Ref may not exist in the remote or may be hidden by permission settings.
|
||||||
couldNotGetRepoStatistics=Could not get repository statistics
|
couldNotGetRepoStatistics=Could not get repository statistics
|
||||||
couldNotLockHEAD=Could not lock HEAD
|
couldNotLockHEAD=Could not lock HEAD
|
||||||
couldNotReadIndexInOneGo=Could not read index in one go, only {0} out of {1} read
|
|
||||||
couldNotReadObjectWhileParsingCommit=Could not read an object while parsing commit {0}
|
couldNotReadObjectWhileParsingCommit=Could not read an object while parsing commit {0}
|
||||||
couldNotRenameDeleteOldIndex=Could not rename delete old index
|
|
||||||
couldNotRenameTemporaryFile=Could not rename temporary file {0} to new location {1}
|
|
||||||
couldNotRenameTemporaryIndexFileToIndex=Could not rename temporary index file to index
|
|
||||||
couldNotRewindToUpstreamCommit=Could not rewind to upstream commit
|
couldNotRewindToUpstreamCommit=Could not rewind to upstream commit
|
||||||
couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
|
couldNotURLEncodeToUTF8=Could not URL encode to UTF-8
|
||||||
couldNotWriteFile=Could not write file {0}
|
|
||||||
countingObjects=Counting objects
|
countingObjects=Counting objects
|
||||||
corruptPack=Pack file {0} is corrupt, removing it from pack list
|
corruptPack=Pack file {0} is corrupt, removing it from pack list
|
||||||
createBranchFailedUnknownReason=Create branch failed for unknown reason
|
createBranchFailedUnknownReason=Create branch failed for unknown reason
|
||||||
|
@ -245,8 +216,6 @@ DIRCExtensionIsTooLargeAt=DIRC extension {0} is too large at {1} bytes.
|
||||||
DIRCExtensionNotSupportedByThisVersion=DIRC extension {0} not supported by this version.
|
DIRCExtensionNotSupportedByThisVersion=DIRC extension {0} not supported by this version.
|
||||||
DIRCHasTooManyEntries=DIRC has too many entries.
|
DIRCHasTooManyEntries=DIRC has too many entries.
|
||||||
DIRCUnrecognizedExtendedFlags=Unrecognized extended flags: {0}
|
DIRCUnrecognizedExtendedFlags=Unrecognized extended flags: {0}
|
||||||
dirtyFilesExist=Dirty files exist. Refusing to merge
|
|
||||||
doesNotHandleMode=Does not handle mode {0} ({1})
|
|
||||||
downloadCancelled=Download cancelled
|
downloadCancelled=Download cancelled
|
||||||
downloadCancelledDuringIndexing=Download cancelled during indexing
|
downloadCancelledDuringIndexing=Download cancelled during indexing
|
||||||
duplicateAdvertisementsOf=duplicate advertisements of {0}
|
duplicateAdvertisementsOf=duplicate advertisements of {0}
|
||||||
|
@ -265,9 +234,6 @@ enumValueNotSupported0=Invalid value: {0}
|
||||||
enumValueNotSupported2=Invalid value: {0}.{1}={2}
|
enumValueNotSupported2=Invalid value: {0}.{1}={2}
|
||||||
enumValueNotSupported3=Invalid value: {0}.{1}.{2}={3}
|
enumValueNotSupported3=Invalid value: {0}.{1}.{2}={3}
|
||||||
enumValuesNotAvailable=Enumerated values of type {0} not available
|
enumValuesNotAvailable=Enumerated values of type {0} not available
|
||||||
errorDecodingFromFile=Error decoding from file {0}
|
|
||||||
errorEncodingFromFile=Error encoding from file {0}
|
|
||||||
errorInBase64CodeReadingStream=Error in Base64 code reading stream.
|
|
||||||
errorInPackedRefs=error in packed-refs
|
errorInPackedRefs=error in packed-refs
|
||||||
errorInvalidProtocolWantedOldNewRef=error: invalid protocol: wanted 'old new ref'
|
errorInvalidProtocolWantedOldNewRef=error: invalid protocol: wanted 'old new ref'
|
||||||
errorListing=Error listing {0}
|
errorListing=Error listing {0}
|
||||||
|
@ -311,7 +277,6 @@ failureDueToOneOfTheFollowing=Failure due to one of the following:
|
||||||
failureUpdatingFETCH_HEAD=Failure updating FETCH_HEAD: {0}
|
failureUpdatingFETCH_HEAD=Failure updating FETCH_HEAD: {0}
|
||||||
failureUpdatingTrackingRef=Failure updating tracking ref {0}: {1}
|
failureUpdatingTrackingRef=Failure updating tracking ref {0}: {1}
|
||||||
fileCannotBeDeleted=File cannot be deleted: {0}
|
fileCannotBeDeleted=File cannot be deleted: {0}
|
||||||
fileIsTooBigForThisConvenienceMethod=File is too big for this convenience method ({0} bytes).
|
|
||||||
fileIsTooLarge=File is too large: {0}
|
fileIsTooLarge=File is too large: {0}
|
||||||
fileModeNotSetForPath=FileMode not set for path {0}
|
fileModeNotSetForPath=FileMode not set for path {0}
|
||||||
filterExecutionFailed=Execution of filter command ''{0}'' on file ''{1}'' failed
|
filterExecutionFailed=Execution of filter command ''{0}'' on file ''{1}'' failed
|
||||||
|
@ -323,9 +288,7 @@ flagNotFromThis={0} not from this.
|
||||||
flagsAlreadyCreated={0} flags already created.
|
flagsAlreadyCreated={0} flags already created.
|
||||||
funnyRefname=funny refname
|
funnyRefname=funny refname
|
||||||
gcFailed=Garbage collection failed.
|
gcFailed=Garbage collection failed.
|
||||||
gcLogExists=A previous GC run reported an error: ''{0}''. Automatic gc will fail until ''{1}'' is removed.
|
|
||||||
gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire.
|
gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire.
|
||||||
gitmodulesNotFound=.gitmodules not found in tree.
|
|
||||||
headRequiredToStash=HEAD required to stash local changes
|
headRequiredToStash=HEAD required to stash local changes
|
||||||
hoursAgo={0} hours ago
|
hoursAgo={0} hours ago
|
||||||
httpConfigCannotNormalizeURL=Cannot normalize URL path {0}: too many .. segments
|
httpConfigCannotNormalizeURL=Cannot normalize URL path {0}: too many .. segments
|
||||||
|
@ -338,14 +301,10 @@ illegalArgumentNotA=Not {0}
|
||||||
illegalCombinationOfArguments=The combination of arguments {0} and {1} is not allowed
|
illegalCombinationOfArguments=The combination of arguments {0} and {1} is not allowed
|
||||||
illegalHookName=Illegal hook name {0}
|
illegalHookName=Illegal hook name {0}
|
||||||
illegalPackingPhase=Illegal packing phase {0}
|
illegalPackingPhase=Illegal packing phase {0}
|
||||||
illegalStateExists=exists {0}
|
|
||||||
improperlyPaddedBase64Input=Improperly padded Base64 input.
|
|
||||||
incorrectHashFor=Incorrect hash for {0}; computed {1} as a {2} from {3} bytes.
|
incorrectHashFor=Incorrect hash for {0}; computed {1} as a {2} from {3} bytes.
|
||||||
incorrectOBJECT_ID_LENGTH=Incorrect OBJECT_ID_LENGTH.
|
incorrectOBJECT_ID_LENGTH=Incorrect OBJECT_ID_LENGTH.
|
||||||
indexFileCorruptedNegativeBucketCount=Invalid negative bucket count read from pack v2 index file: {0}
|
indexFileCorruptedNegativeBucketCount=Invalid negative bucket count read from pack v2 index file: {0}
|
||||||
indexFileIsInUse=Index file is in use
|
|
||||||
indexFileIsTooLargeForJgit=Index file is too large for jgit
|
indexFileIsTooLargeForJgit=Index file is too large for jgit
|
||||||
indexSignatureIsInvalid=Index signature is invalid: {0}
|
|
||||||
indexWriteException=Modified index could not be written
|
indexWriteException=Modified index could not be written
|
||||||
initFailedBareRepoDifferentDirs=When initializing a bare repo with directory {0} and separate git-dir {1} specified both folders must point to the same location
|
initFailedBareRepoDifferentDirs=When initializing a bare repo with directory {0} and separate git-dir {1} specified both folders must point to the same location
|
||||||
initFailedDirIsNoDirectory=Cannot set directory to ''{0}'' which is not a directory
|
initFailedDirIsNoDirectory=Cannot set directory to ''{0}'' which is not a directory
|
||||||
|
@ -363,7 +322,6 @@ invalidAdvertisementOf=invalid advertisement of {0}
|
||||||
invalidAncestryLength=Invalid ancestry length
|
invalidAncestryLength=Invalid ancestry length
|
||||||
invalidBooleanValue=Invalid boolean value: {0}.{1}={2}
|
invalidBooleanValue=Invalid boolean value: {0}.{1}={2}
|
||||||
invalidChannel=Invalid channel {0}
|
invalidChannel=Invalid channel {0}
|
||||||
invalidCharacterInBase64Data=Invalid character in Base64 data.
|
|
||||||
invalidCommitParentNumber=Invalid commit parent number
|
invalidCommitParentNumber=Invalid commit parent number
|
||||||
invalidDepth=Invalid depth: {0}
|
invalidDepth=Invalid depth: {0}
|
||||||
invalidEncryption=Invalid encryption
|
invalidEncryption=Invalid encryption
|
||||||
|
@ -388,10 +346,6 @@ invalidObject=Invalid {0} {1}: {2}
|
||||||
invalidOldIdSent=invalid old id sent
|
invalidOldIdSent=invalid old id sent
|
||||||
invalidPacketLineHeader=Invalid packet line header: {0}
|
invalidPacketLineHeader=Invalid packet line header: {0}
|
||||||
invalidPath=Invalid path: {0}
|
invalidPath=Invalid path: {0}
|
||||||
invalidPathContainsSeparator=Invalid path (contains separator ''{0}''): {1}
|
|
||||||
invalidPathPeriodAtEndWindows=Invalid path (period at end is ignored by Windows): {0}
|
|
||||||
invalidPathSpaceAtEndWindows=Invalid path (space at end is ignored by Windows): {0}
|
|
||||||
invalidPathReservedOnWindows=Invalid path (''{0}'' is reserved on Windows): {1}
|
|
||||||
invalidPurgeFactor=Invalid purgeFactor {0}, values have to be in range between 0 and 1
|
invalidPurgeFactor=Invalid purgeFactor {0}, values have to be in range between 0 and 1
|
||||||
invalidRedirectLocation=Invalid redirect location {0} -> {1}
|
invalidRedirectLocation=Invalid redirect location {0} -> {1}
|
||||||
invalidRefAdvertisementLine=Invalid ref advertisement line: ''{1}''
|
invalidRefAdvertisementLine=Invalid ref advertisement line: ''{1}''
|
||||||
|
@ -434,7 +388,6 @@ lockError=lock error: {0}
|
||||||
lockFailedRetry=locking {0} failed after {1} retries
|
lockFailedRetry=locking {0} failed after {1} retries
|
||||||
lockOnNotClosed=Lock on {0} not closed.
|
lockOnNotClosed=Lock on {0} not closed.
|
||||||
lockOnNotHeld=Lock on {0} not held.
|
lockOnNotHeld=Lock on {0} not held.
|
||||||
malformedpersonIdentString=Malformed PersonIdent string (no < was found): {0}
|
|
||||||
maxCountMustBeNonNegative=max count must be >= 0
|
maxCountMustBeNonNegative=max count must be >= 0
|
||||||
mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2}
|
mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2}
|
||||||
mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2}
|
mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2}
|
||||||
|
@ -442,7 +395,6 @@ mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a def
|
||||||
mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD
|
mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD
|
||||||
mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4}
|
mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4}
|
||||||
mergeRecursiveConflictsWhenMergingCommonAncestors=Multiple common ancestors were found and merging them resulted in a conflict: {0}, {1}
|
mergeRecursiveConflictsWhenMergingCommonAncestors=Multiple common ancestors were found and merging them resulted in a conflict: {0}, {1}
|
||||||
mergeRecursiveReturnedNoCommit=Merge returned no commit:\n Depth {0}\n Head one {1}\n Head two {2}
|
|
||||||
mergeRecursiveTooManyMergeBasesFor = "More than {0} merge bases for:\n a {1}\n b {2} found:\n count {3}"
|
mergeRecursiveTooManyMergeBasesFor = "More than {0} merge bases for:\n a {1}\n b {2} found:\n count {3}"
|
||||||
messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger
|
messageAndTaggerNotAllowedInUnannotatedTags = Unannotated tags cannot have a message or tagger
|
||||||
minutesAgo={0} minutes ago
|
minutesAgo={0} minutes ago
|
||||||
|
@ -466,9 +418,6 @@ monthsAgo={0} months ago
|
||||||
multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3}
|
multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3}
|
||||||
nameMustNotBeNullOrEmpty=Ref name must not be null or empty.
|
nameMustNotBeNullOrEmpty=Ref name must not be null or empty.
|
||||||
need2Arguments=Need 2 arguments
|
need2Arguments=Need 2 arguments
|
||||||
needPackOut=need packOut
|
|
||||||
needsAtLeastOneEntry=Needs at least one entry
|
|
||||||
needsWorkdir=Needs workdir
|
|
||||||
newIdMustNotBeNull=New ID must not be null
|
newIdMustNotBeNull=New ID must not be null
|
||||||
newlineInQuotesNotAllowed=Newline in quotes not allowed
|
newlineInQuotesNotAllowed=Newline in quotes not allowed
|
||||||
noApplyInDelete=No apply in delete
|
noApplyInDelete=No apply in delete
|
||||||
|
@ -498,16 +447,13 @@ nothingToPush=Nothing to push.
|
||||||
notMergedExceptionMessage=Branch was not deleted as it has not been merged yet; use the force option to delete it anyway
|
notMergedExceptionMessage=Branch was not deleted as it has not been merged yet; use the force option to delete it anyway
|
||||||
noXMLParserAvailable=No XML parser available.
|
noXMLParserAvailable=No XML parser available.
|
||||||
objectAtHasBadZlibStream=Object at {0} in {1} has bad zlib stream
|
objectAtHasBadZlibStream=Object at {0} in {1} has bad zlib stream
|
||||||
objectAtPathDoesNotHaveId=Object at path "{0}" does not have an id assigned. All object ids must be assigned prior to writing a tree.
|
|
||||||
objectIsCorrupt=Object {0} is corrupt: {1}
|
objectIsCorrupt=Object {0} is corrupt: {1}
|
||||||
objectIsCorrupt3={0}: object {1}: {2}
|
objectIsCorrupt3={0}: object {1}: {2}
|
||||||
objectIsNotA=Object {0} is not a {1}.
|
objectIsNotA=Object {0} is not a {1}.
|
||||||
objectNotFound=Object {0} not found.
|
objectNotFound=Object {0} not found.
|
||||||
objectNotFoundIn=Object {0} not found in {1}.
|
objectNotFoundIn=Object {0} not found in {1}.
|
||||||
obtainingCommitsForCherryPick=Obtaining commits that need to be cherry-picked
|
obtainingCommitsForCherryPick=Obtaining commits that need to be cherry-picked
|
||||||
offsetWrittenDeltaBaseForObjectNotFoundInAPack=Offset-written delta base for object not found in a pack
|
|
||||||
oldIdMustNotBeNull=Expected old ID must not be null
|
oldIdMustNotBeNull=Expected old ID must not be null
|
||||||
onlyAlreadyUpToDateAndFastForwardMergesAreAvailable=only already-up-to-date and fast forward merges are available
|
|
||||||
onlyOneFetchSupported=Only one fetch supported
|
onlyOneFetchSupported=Only one fetch supported
|
||||||
onlyOneOperationCallPerConnectionIsSupported=Only one operation call per connection is supported.
|
onlyOneOperationCallPerConnectionIsSupported=Only one operation call per connection is supported.
|
||||||
openFilesMustBeAtLeast1=Open files must be >= 1
|
openFilesMustBeAtLeast1=Open files must be >= 1
|
||||||
|
@ -517,7 +463,6 @@ outputHasAlreadyBeenStarted=Output has already been started.
|
||||||
overflowedReftableBlock=Overflowed reftable block
|
overflowedReftableBlock=Overflowed reftable block
|
||||||
packChecksumMismatch=Pack checksum mismatch detected for pack file {0}: .pack has {1} whilst .idx has {2}
|
packChecksumMismatch=Pack checksum mismatch detected for pack file {0}: .pack has {1} whilst .idx has {2}
|
||||||
packCorruptedWhileWritingToFilesystem=Pack corrupted while writing to filesystem
|
packCorruptedWhileWritingToFilesystem=Pack corrupted while writing to filesystem
|
||||||
packDoesNotMatchIndex=Pack {0} does not match index
|
|
||||||
packedRefsHandleIsStale=packed-refs handle is stale, {0}. retry
|
packedRefsHandleIsStale=packed-refs handle is stale, {0}. retry
|
||||||
packetSizeMustBeAtLeast=packet size {0} must be >= {1}
|
packetSizeMustBeAtLeast=packet size {0} must be >= {1}
|
||||||
packetSizeMustBeAtMost=packet size {0} must be <= {1}
|
packetSizeMustBeAtMost=packet size {0} must be <= {1}
|
||||||
|
@ -528,7 +473,7 @@ packfileIsTruncated=Packfile {0} is truncated.
|
||||||
packfileIsTruncatedNoParam=Packfile is truncated.
|
packfileIsTruncatedNoParam=Packfile is truncated.
|
||||||
packHandleIsStale=Pack file {0} handle is stale, removing it from pack list
|
packHandleIsStale=Pack file {0} handle is stale, removing it from pack list
|
||||||
packHasUnresolvedDeltas=pack has unresolved deltas
|
packHasUnresolvedDeltas=pack has unresolved deltas
|
||||||
packInaccessible=Failed to access pack file {0}, caught {2} consecutive errors while trying to access this pack.
|
packInaccessible=Failed to access pack file {0}, caught {1} consecutive errors while trying to access this pack.
|
||||||
packingCancelledDuringObjectsWriting=Packing cancelled during objects writing
|
packingCancelledDuringObjectsWriting=Packing cancelled during objects writing
|
||||||
packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2}
|
packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2}
|
||||||
packRefs=Pack refs
|
packRefs=Pack refs
|
||||||
|
@ -539,7 +484,6 @@ packWriterStatistics=Total {0,number,#0} (delta {1,number,#0}), reused {2,number
|
||||||
panicCantRenameIndexFile=Panic: index file {0} must be renamed to replace {1}; until then repository is corrupt
|
panicCantRenameIndexFile=Panic: index file {0} must be renamed to replace {1}; until then repository is corrupt
|
||||||
patchApplyException=Cannot apply: {0}
|
patchApplyException=Cannot apply: {0}
|
||||||
patchFormatException=Format error: {0}
|
patchFormatException=Format error: {0}
|
||||||
pathIsNotInWorkingDir=Path is not in working dir
|
|
||||||
pathNotConfigured=Submodule path is not configured
|
pathNotConfigured=Submodule path is not configured
|
||||||
peeledLineBeforeRef=Peeled line before ref.
|
peeledLineBeforeRef=Peeled line before ref.
|
||||||
peeledRefIsRequired=Peeled ref is required.
|
peeledRefIsRequired=Peeled ref is required.
|
||||||
|
@ -552,7 +496,6 @@ progressMonUploading=Uploading {0}
|
||||||
propertyIsAlreadyNonNull=Property is already non null
|
propertyIsAlreadyNonNull=Property is already non null
|
||||||
pruneLoosePackedObjects=Prune loose objects also found in pack files
|
pruneLoosePackedObjects=Prune loose objects also found in pack files
|
||||||
pruneLooseUnreferencedObjects=Prune loose, unreferenced objects
|
pruneLooseUnreferencedObjects=Prune loose, unreferenced objects
|
||||||
pullOnRepoWithoutHEADCurrentlyNotSupported=Pull on repository without HEAD currently not supported
|
|
||||||
pullTaskName=Pull
|
pullTaskName=Pull
|
||||||
pushCancelled=push cancelled
|
pushCancelled=push cancelled
|
||||||
pushCertificateInvalidField=Push certificate has missing or invalid value for {0}
|
pushCertificateInvalidField=Push certificate has missing or invalid value for {0}
|
||||||
|
@ -638,7 +581,6 @@ shortReadOfOptionalDIRCExtensionExpectedAnotherBytes=Short read of optional DIRC
|
||||||
shortSkipOfBlock=Short skip of block.
|
shortSkipOfBlock=Short skip of block.
|
||||||
signingNotSupportedOnTag=Signing isn't supported on tag operations yet.
|
signingNotSupportedOnTag=Signing isn't supported on tag operations yet.
|
||||||
similarityScoreMustBeWithinBounds=Similarity score must be between 0 and 100.
|
similarityScoreMustBeWithinBounds=Similarity score must be between 0 and 100.
|
||||||
sizeExceeds2GB=Path {0} size {1} exceeds 2 GiB limit.
|
|
||||||
skipMustBeNonNegative=skip must be >= 0
|
skipMustBeNonNegative=skip must be >= 0
|
||||||
smartHTTPPushDisabled=smart HTTP push disabled
|
smartHTTPPushDisabled=smart HTTP push disabled
|
||||||
sourceDestinationMustMatch=Source/Destination must match.
|
sourceDestinationMustMatch=Source/Destination must match.
|
||||||
|
@ -659,7 +601,6 @@ sslVerifyCannotSave=Could not save setting for http.sslVerify
|
||||||
staleRevFlagsOn=Stale RevFlags on {0}
|
staleRevFlagsOn=Stale RevFlags on {0}
|
||||||
startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported
|
startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported
|
||||||
stashApplyConflict=Applying stashed changes resulted in a conflict
|
stashApplyConflict=Applying stashed changes resulted in a conflict
|
||||||
stashApplyConflictInIndex=Applying stashed index changes resulted in a conflict. Dropped index changes.
|
|
||||||
stashApplyFailed=Applying stashed changes did not successfully complete
|
stashApplyFailed=Applying stashed changes did not successfully complete
|
||||||
stashApplyOnUnsafeRepository=Cannot apply stashed commit on a repository with state: {0}
|
stashApplyOnUnsafeRepository=Cannot apply stashed commit on a repository with state: {0}
|
||||||
stashApplyWithoutHead=Cannot apply stashed commit in an empty repository or onto an unborn branch
|
stashApplyWithoutHead=Cannot apply stashed commit in an empty repository or onto an unborn branch
|
||||||
|
@ -679,7 +620,6 @@ submoduleNameInvalid=Invalid submodule name ''{0}''
|
||||||
submoduleParentRemoteUrlInvalid=Cannot remove segment from remote url ''{0}''
|
submoduleParentRemoteUrlInvalid=Cannot remove segment from remote url ''{0}''
|
||||||
submodulePathInvalid=Invalid submodule path ''{0}''
|
submodulePathInvalid=Invalid submodule path ''{0}''
|
||||||
submoduleUrlInvalid=Invalid submodule URL ''{0}''
|
submoduleUrlInvalid=Invalid submodule URL ''{0}''
|
||||||
submodulesNotSupported=Submodules are not supported
|
|
||||||
supportOnlyPackIndexVersion2=Only support index version 2
|
supportOnlyPackIndexVersion2=Only support index version 2
|
||||||
systemConfigFileInvalid=System wide config file {0} is invalid {1}
|
systemConfigFileInvalid=System wide config file {0} is invalid {1}
|
||||||
tagAlreadyExists=tag ''{0}'' already exists
|
tagAlreadyExists=tag ''{0}'' already exists
|
||||||
|
@ -702,7 +642,6 @@ transportExceptionMissingAssumed=Missing assumed {0}
|
||||||
transportExceptionReadRef=read {0}
|
transportExceptionReadRef=read {0}
|
||||||
transportNeedsRepository=Transport needs repository
|
transportNeedsRepository=Transport needs repository
|
||||||
transportProvidedRefWithNoObjectId=Transport provided ref {0} with no object id
|
transportProvidedRefWithNoObjectId=Transport provided ref {0} with no object id
|
||||||
transportProtoAmazonS3=Amazon S3
|
|
||||||
transportProtoBundleFile=Git Bundle File
|
transportProtoBundleFile=Git Bundle File
|
||||||
transportProtoFTP=FTP
|
transportProtoFTP=FTP
|
||||||
transportProtoGitAnon=Anonymous Git
|
transportProtoGitAnon=Anonymous Git
|
||||||
|
@ -714,7 +653,6 @@ transportProtoTest=Test
|
||||||
transportSSHRetryInterrupt=Interrupted while waiting for retry
|
transportSSHRetryInterrupt=Interrupted while waiting for retry
|
||||||
treeEntryAlreadyExists=Tree entry "{0}" already exists.
|
treeEntryAlreadyExists=Tree entry "{0}" already exists.
|
||||||
treeFilterMarkerTooManyFilters=Too many markTreeFilters passed, maximum number is {0} (passed {1})
|
treeFilterMarkerTooManyFilters=Too many markTreeFilters passed, maximum number is {0} (passed {1})
|
||||||
treeIteratorDoesNotSupportRemove=TreeIterator does not support remove()
|
|
||||||
treeWalkMustHaveExactlyTwoTrees=TreeWalk should have exactly two trees.
|
treeWalkMustHaveExactlyTwoTrees=TreeWalk should have exactly two trees.
|
||||||
truncatedHunkLinesMissingForAncestor=Truncated hunk, at least {0} lines missing for ancestor {1}
|
truncatedHunkLinesMissingForAncestor=Truncated hunk, at least {0} lines missing for ancestor {1}
|
||||||
truncatedHunkNewLinesMissing=Truncated hunk, at least {0} new lines is missing
|
truncatedHunkNewLinesMissing=Truncated hunk, at least {0} new lines is missing
|
||||||
|
@ -724,10 +662,8 @@ unableToCheckConnectivity=Unable to check connectivity.
|
||||||
unableToCreateNewObject=Unable to create new object: {0}
|
unableToCreateNewObject=Unable to create new object: {0}
|
||||||
unableToReadPackfile=Unable to read packfile {0}
|
unableToReadPackfile=Unable to read packfile {0}
|
||||||
unableToRemovePath=Unable to remove path ''{0}''
|
unableToRemovePath=Unable to remove path ''{0}''
|
||||||
unableToStore=Unable to store {0}.
|
|
||||||
unableToWrite=Unable to write {0}
|
unableToWrite=Unable to write {0}
|
||||||
unauthorized=Unauthorized
|
unauthorized=Unauthorized
|
||||||
underflowedReftableBlock=Underflowed reftable block
|
|
||||||
unencodeableFile=Unencodable file: {0}
|
unencodeableFile=Unencodable file: {0}
|
||||||
unexpectedCompareResult=Unexpected metadata comparison result: {0}
|
unexpectedCompareResult=Unexpected metadata comparison result: {0}
|
||||||
unexpectedEndOfConfigFile=Unexpected end of config file
|
unexpectedEndOfConfigFile=Unexpected end of config file
|
||||||
|
@ -743,7 +679,6 @@ unexpectedSubmoduleStatus=Unexpected submodule status: ''{0}''
|
||||||
unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed.
|
unknownOrUnsupportedCommand=Unknown or unsupported command "{0}", only "{1}" is allowed.
|
||||||
unknownDIRCVersion=Unknown DIRC version {0}
|
unknownDIRCVersion=Unknown DIRC version {0}
|
||||||
unknownHost=unknown host
|
unknownHost=unknown host
|
||||||
unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}
|
|
||||||
unknownObject=unknown object
|
unknownObject=unknown object
|
||||||
unknownObjectInIndex=unknown object {0} found in index but not in pack file
|
unknownObjectInIndex=unknown object {0} found in index but not in pack file
|
||||||
unknownObjectType=Unknown object type {0}.
|
unknownObjectType=Unknown object type {0}.
|
||||||
|
|
|
@ -61,7 +61,6 @@ public static RepoText get() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// @formatter:off
|
// @formatter:off
|
||||||
/***/ public String copyFileFailed;
|
|
||||||
/***/ public String errorIncludeFile;
|
/***/ public String errorIncludeFile;
|
||||||
/***/ public String errorIncludeNotImplemented;
|
/***/ public String errorIncludeNotImplemented;
|
||||||
/***/ public String errorNoDefault;
|
/***/ public String errorNoDefault;
|
||||||
|
|
|
@ -96,13 +96,10 @@ public static JGitText get() {
|
||||||
/***/ public String badSectionEntry;
|
/***/ public String badSectionEntry;
|
||||||
/***/ public String badShallowLine;
|
/***/ public String badShallowLine;
|
||||||
/***/ public String bareRepositoryNoWorkdirAndIndex;
|
/***/ public String bareRepositoryNoWorkdirAndIndex;
|
||||||
/***/ public String base64InputNotProperlyPadded;
|
|
||||||
/***/ public String baseLengthIncorrect;
|
/***/ public String baseLengthIncorrect;
|
||||||
/***/ public String bitmapMissingObject;
|
/***/ public String bitmapMissingObject;
|
||||||
/***/ public String bitmapsMustBePrepared;
|
/***/ public String bitmapsMustBePrepared;
|
||||||
/***/ public String blameNotCommittedYet;
|
/***/ public String blameNotCommittedYet;
|
||||||
/***/ public String blobNotFound;
|
|
||||||
/***/ public String blobNotFoundForPath;
|
|
||||||
/***/ public String blockLimitNotMultipleOfBlockSize;
|
/***/ public String blockLimitNotMultipleOfBlockSize;
|
||||||
/***/ public String blockLimitNotPositive;
|
/***/ public String blockLimitNotPositive;
|
||||||
/***/ public String blockSizeNotPowerOf2;
|
/***/ public String blockSizeNotPowerOf2;
|
||||||
|
@ -115,7 +112,6 @@ public static JGitText get() {
|
||||||
/***/ public String cannotBeCombined;
|
/***/ public String cannotBeCombined;
|
||||||
/***/ public String cannotBeRecursiveWhenTreesAreIncluded;
|
/***/ public String cannotBeRecursiveWhenTreesAreIncluded;
|
||||||
/***/ public String cannotChangeActionOnComment;
|
/***/ public String cannotChangeActionOnComment;
|
||||||
/***/ public String cannotChangeToComment;
|
|
||||||
/***/ public String cannotCheckoutFromUnbornBranch;
|
/***/ public String cannotCheckoutFromUnbornBranch;
|
||||||
/***/ public String cannotCheckoutOursSwitchBranch;
|
/***/ public String cannotCheckoutOursSwitchBranch;
|
||||||
/***/ public String cannotCombineSquashWithNoff;
|
/***/ public String cannotCombineSquashWithNoff;
|
||||||
|
@ -132,8 +128,6 @@ public static JGitText get() {
|
||||||
/***/ public String cannotDeleteCheckedOutBranch;
|
/***/ public String cannotDeleteCheckedOutBranch;
|
||||||
/***/ public String cannotDeleteFile;
|
/***/ public String cannotDeleteFile;
|
||||||
/***/ public String cannotDeleteObjectsPath;
|
/***/ public String cannotDeleteObjectsPath;
|
||||||
/***/ public String cannotDeleteStaleTrackingRef;
|
|
||||||
/***/ public String cannotDeleteStaleTrackingRef2;
|
|
||||||
/***/ public String cannotDetermineProxyFor;
|
/***/ public String cannotDetermineProxyFor;
|
||||||
/***/ public String cannotDownload;
|
/***/ public String cannotDownload;
|
||||||
/***/ public String cannotEnterObjectsPath;
|
/***/ public String cannotEnterObjectsPath;
|
||||||
|
@ -165,20 +159,16 @@ public static JGitText get() {
|
||||||
/***/ public String cannotReadObjectsPath;
|
/***/ public String cannotReadObjectsPath;
|
||||||
/***/ public String cannotReadTree;
|
/***/ public String cannotReadTree;
|
||||||
/***/ public String cannotRebaseWithoutCurrentHead;
|
/***/ public String cannotRebaseWithoutCurrentHead;
|
||||||
/***/ public String cannotResolveLocalTrackingRefForUpdating;
|
|
||||||
/***/ public String cannotSaveConfig;
|
/***/ public String cannotSaveConfig;
|
||||||
/***/ public String cannotSquashFixupWithoutPreviousCommit;
|
/***/ public String cannotSquashFixupWithoutPreviousCommit;
|
||||||
/***/ public String cannotStoreObjects;
|
/***/ public String cannotStoreObjects;
|
||||||
/***/ public String cannotResolveUniquelyAbbrevObjectId;
|
/***/ public String cannotResolveUniquelyAbbrevObjectId;
|
||||||
/***/ public String cannotUnloadAModifiedTree;
|
|
||||||
/***/ public String cannotUpdateUnbornBranch;
|
/***/ public String cannotUpdateUnbornBranch;
|
||||||
/***/ public String cannotWorkWithOtherStagesThanZeroRightNow;
|
|
||||||
/***/ public String cannotWriteObjectsPath;
|
/***/ public String cannotWriteObjectsPath;
|
||||||
/***/ public String canOnlyCherryPickCommitsWithOneParent;
|
/***/ public String canOnlyCherryPickCommitsWithOneParent;
|
||||||
/***/ public String canOnlyRevertCommitsWithOneParent;
|
/***/ public String canOnlyRevertCommitsWithOneParent;
|
||||||
/***/ public String commitDoesNotHaveGivenParent;
|
/***/ public String commitDoesNotHaveGivenParent;
|
||||||
/***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
|
/***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
|
||||||
/***/ public String cantPassMeATree;
|
|
||||||
/***/ public String channelMustBeInRange1_255;
|
/***/ public String channelMustBeInRange1_255;
|
||||||
/***/ public String characterClassIsNotSupported;
|
/***/ public String characterClassIsNotSupported;
|
||||||
/***/ public String checkingOutFiles;
|
/***/ public String checkingOutFiles;
|
||||||
|
@ -193,7 +183,6 @@ public static JGitText get() {
|
||||||
/***/ public String commandClosedStderrButDidntExit;
|
/***/ public String commandClosedStderrButDidntExit;
|
||||||
/***/ public String commandRejectedByHook;
|
/***/ public String commandRejectedByHook;
|
||||||
/***/ public String commandWasCalledInTheWrongState;
|
/***/ public String commandWasCalledInTheWrongState;
|
||||||
/***/ public String commitAlreadyExists;
|
|
||||||
/***/ public String commitMessageNotSpecified;
|
/***/ public String commitMessageNotSpecified;
|
||||||
/***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
|
/***/ public String commitOnRepoWithoutHEADCurrentlyNotSupported;
|
||||||
/***/ public String commitAmendOnInitialNotPossible;
|
/***/ public String commitAmendOnInitialNotPossible;
|
||||||
|
@ -209,14 +198,11 @@ public static JGitText get() {
|
||||||
/***/ public String corruptObjectBadDate;
|
/***/ public String corruptObjectBadDate;
|
||||||
/***/ public String corruptObjectBadEmail;
|
/***/ public String corruptObjectBadEmail;
|
||||||
/***/ public String corruptObjectBadStream;
|
/***/ public String corruptObjectBadStream;
|
||||||
/***/ public String corruptObjectBadStreamCorruptHeader;
|
|
||||||
/***/ public String corruptObjectBadTimezone;
|
/***/ public String corruptObjectBadTimezone;
|
||||||
/***/ public String corruptObjectDuplicateEntryNames;
|
/***/ public String corruptObjectDuplicateEntryNames;
|
||||||
/***/ public String corruptObjectGarbageAfterSize;
|
/***/ public String corruptObjectGarbageAfterSize;
|
||||||
/***/ public String corruptObjectIncorrectLength;
|
/***/ public String corruptObjectIncorrectLength;
|
||||||
/***/ public String corruptObjectIncorrectSorting;
|
/***/ public String corruptObjectIncorrectSorting;
|
||||||
/***/ public String corruptObjectInvalidEntryMode;
|
|
||||||
/***/ public String corruptObjectInvalidMode;
|
|
||||||
/***/ public String corruptObjectInvalidModeChar;
|
/***/ public String corruptObjectInvalidModeChar;
|
||||||
/***/ public String corruptObjectInvalidModeStartsZero;
|
/***/ public String corruptObjectInvalidModeStartsZero;
|
||||||
/***/ public String corruptObjectInvalidMode2;
|
/***/ public String corruptObjectInvalidMode2;
|
||||||
|
@ -236,7 +222,6 @@ public static JGitText get() {
|
||||||
/***/ public String corruptObjectInvalidTree;
|
/***/ public String corruptObjectInvalidTree;
|
||||||
/***/ public String corruptObjectInvalidType;
|
/***/ public String corruptObjectInvalidType;
|
||||||
/***/ public String corruptObjectInvalidType2;
|
/***/ public String corruptObjectInvalidType2;
|
||||||
/***/ public String corruptObjectMalformedHeader;
|
|
||||||
/***/ public String corruptObjectMissingEmail;
|
/***/ public String corruptObjectMissingEmail;
|
||||||
/***/ public String corruptObjectNameContainsByte;
|
/***/ public String corruptObjectNameContainsByte;
|
||||||
/***/ public String corruptObjectNameContainsChar;
|
/***/ public String corruptObjectNameContainsChar;
|
||||||
|
@ -249,15 +234,9 @@ public static JGitText get() {
|
||||||
/***/ public String corruptObjectNoAuthor;
|
/***/ public String corruptObjectNoAuthor;
|
||||||
/***/ public String corruptObjectNoCommitter;
|
/***/ public String corruptObjectNoCommitter;
|
||||||
/***/ public String corruptObjectNoHeader;
|
/***/ public String corruptObjectNoHeader;
|
||||||
/***/ public String corruptObjectNoObject;
|
|
||||||
/***/ public String corruptObjectNoObjectHeader;
|
/***/ public String corruptObjectNoObjectHeader;
|
||||||
/***/ public String corruptObjectNoTaggerBadHeader;
|
|
||||||
/***/ public String corruptObjectNoTaggerHeader;
|
|
||||||
/***/ public String corruptObjectNoTagHeader;
|
/***/ public String corruptObjectNoTagHeader;
|
||||||
/***/ public String corruptObjectNoTagName;
|
|
||||||
/***/ public String corruptObjectNotree;
|
|
||||||
/***/ public String corruptObjectNotreeHeader;
|
/***/ public String corruptObjectNotreeHeader;
|
||||||
/***/ public String corruptObjectNoType;
|
|
||||||
/***/ public String corruptObjectNoTypeHeader;
|
/***/ public String corruptObjectNoTypeHeader;
|
||||||
/***/ public String corruptObjectPackfileChecksumIncorrect;
|
/***/ public String corruptObjectPackfileChecksumIncorrect;
|
||||||
/***/ public String corruptObjectTruncatedInMode;
|
/***/ public String corruptObjectTruncatedInMode;
|
||||||
|
@ -266,20 +245,12 @@ public static JGitText get() {
|
||||||
/***/ public String corruptObjectZeroId;
|
/***/ public String corruptObjectZeroId;
|
||||||
/***/ public String corruptPack;
|
/***/ public String corruptPack;
|
||||||
/***/ public String corruptUseCnt;
|
/***/ public String corruptUseCnt;
|
||||||
/***/ public String couldNotCheckOutBecauseOfConflicts;
|
|
||||||
/***/ public String couldNotDeleteLockFileShouldNotHappen;
|
|
||||||
/***/ public String couldNotDeleteTemporaryIndexFileShouldNotHappen;
|
|
||||||
/***/ public String couldNotGetAdvertisedRef;
|
/***/ public String couldNotGetAdvertisedRef;
|
||||||
/***/ public String couldNotGetRepoStatistics;
|
/***/ public String couldNotGetRepoStatistics;
|
||||||
/***/ public String couldNotLockHEAD;
|
/***/ public String couldNotLockHEAD;
|
||||||
/***/ public String couldNotReadIndexInOneGo;
|
|
||||||
/***/ public String couldNotReadObjectWhileParsingCommit;
|
/***/ public String couldNotReadObjectWhileParsingCommit;
|
||||||
/***/ public String couldNotRenameDeleteOldIndex;
|
|
||||||
/***/ public String couldNotRenameTemporaryFile;
|
|
||||||
/***/ public String couldNotRenameTemporaryIndexFileToIndex;
|
|
||||||
/***/ public String couldNotRewindToUpstreamCommit;
|
/***/ public String couldNotRewindToUpstreamCommit;
|
||||||
/***/ public String couldNotURLEncodeToUTF8;
|
/***/ public String couldNotURLEncodeToUTF8;
|
||||||
/***/ public String couldNotWriteFile;
|
|
||||||
/***/ public String countingObjects;
|
/***/ public String countingObjects;
|
||||||
/***/ public String createBranchFailedUnknownReason;
|
/***/ public String createBranchFailedUnknownReason;
|
||||||
/***/ public String createBranchUnexpectedResult;
|
/***/ public String createBranchUnexpectedResult;
|
||||||
|
@ -306,8 +277,6 @@ public static JGitText get() {
|
||||||
/***/ public String DIRCExtensionNotSupportedByThisVersion;
|
/***/ public String DIRCExtensionNotSupportedByThisVersion;
|
||||||
/***/ public String DIRCHasTooManyEntries;
|
/***/ public String DIRCHasTooManyEntries;
|
||||||
/***/ public String DIRCUnrecognizedExtendedFlags;
|
/***/ public String DIRCUnrecognizedExtendedFlags;
|
||||||
/***/ public String dirtyFilesExist;
|
|
||||||
/***/ public String doesNotHandleMode;
|
|
||||||
/***/ public String downloadCancelled;
|
/***/ public String downloadCancelled;
|
||||||
/***/ public String downloadCancelledDuringIndexing;
|
/***/ public String downloadCancelledDuringIndexing;
|
||||||
/***/ public String duplicateAdvertisementsOf;
|
/***/ public String duplicateAdvertisementsOf;
|
||||||
|
@ -326,9 +295,6 @@ public static JGitText get() {
|
||||||
/***/ public String enumValueNotSupported2;
|
/***/ public String enumValueNotSupported2;
|
||||||
/***/ public String enumValueNotSupported3;
|
/***/ public String enumValueNotSupported3;
|
||||||
/***/ public String enumValuesNotAvailable;
|
/***/ public String enumValuesNotAvailable;
|
||||||
/***/ public String errorDecodingFromFile;
|
|
||||||
/***/ public String errorEncodingFromFile;
|
|
||||||
/***/ public String errorInBase64CodeReadingStream;
|
|
||||||
/***/ public String errorInPackedRefs;
|
/***/ public String errorInPackedRefs;
|
||||||
/***/ public String errorInvalidProtocolWantedOldNewRef;
|
/***/ public String errorInvalidProtocolWantedOldNewRef;
|
||||||
/***/ public String errorListing;
|
/***/ public String errorListing;
|
||||||
|
@ -372,7 +338,6 @@ public static JGitText get() {
|
||||||
/***/ public String failureUpdatingFETCH_HEAD;
|
/***/ public String failureUpdatingFETCH_HEAD;
|
||||||
/***/ public String failureUpdatingTrackingRef;
|
/***/ public String failureUpdatingTrackingRef;
|
||||||
/***/ public String fileCannotBeDeleted;
|
/***/ public String fileCannotBeDeleted;
|
||||||
/***/ public String fileIsTooBigForThisConvenienceMethod;
|
|
||||||
/***/ public String fileIsTooLarge;
|
/***/ public String fileIsTooLarge;
|
||||||
/***/ public String fileModeNotSetForPath;
|
/***/ public String fileModeNotSetForPath;
|
||||||
/***/ public String filterExecutionFailed;
|
/***/ public String filterExecutionFailed;
|
||||||
|
@ -384,9 +349,7 @@ public static JGitText get() {
|
||||||
/***/ public String flagsAlreadyCreated;
|
/***/ public String flagsAlreadyCreated;
|
||||||
/***/ public String funnyRefname;
|
/***/ public String funnyRefname;
|
||||||
/***/ public String gcFailed;
|
/***/ public String gcFailed;
|
||||||
/***/ public String gcLogExists;
|
|
||||||
/***/ public String gcTooManyUnpruned;
|
/***/ public String gcTooManyUnpruned;
|
||||||
/***/ public String gitmodulesNotFound;
|
|
||||||
/***/ public String headRequiredToStash;
|
/***/ public String headRequiredToStash;
|
||||||
/***/ public String hoursAgo;
|
/***/ public String hoursAgo;
|
||||||
/***/ public String httpConfigCannotNormalizeURL;
|
/***/ public String httpConfigCannotNormalizeURL;
|
||||||
|
@ -399,14 +362,10 @@ public static JGitText get() {
|
||||||
/***/ public String illegalCombinationOfArguments;
|
/***/ public String illegalCombinationOfArguments;
|
||||||
/***/ public String illegalHookName;
|
/***/ public String illegalHookName;
|
||||||
/***/ public String illegalPackingPhase;
|
/***/ public String illegalPackingPhase;
|
||||||
/***/ public String illegalStateExists;
|
|
||||||
/***/ public String improperlyPaddedBase64Input;
|
|
||||||
/***/ public String incorrectHashFor;
|
/***/ public String incorrectHashFor;
|
||||||
/***/ public String incorrectOBJECT_ID_LENGTH;
|
/***/ public String incorrectOBJECT_ID_LENGTH;
|
||||||
/***/ public String indexFileCorruptedNegativeBucketCount;
|
/***/ public String indexFileCorruptedNegativeBucketCount;
|
||||||
/***/ public String indexFileIsInUse;
|
|
||||||
/***/ public String indexFileIsTooLargeForJgit;
|
/***/ public String indexFileIsTooLargeForJgit;
|
||||||
/***/ public String indexSignatureIsInvalid;
|
|
||||||
/***/ public String indexWriteException;
|
/***/ public String indexWriteException;
|
||||||
/***/ public String initFailedBareRepoDifferentDirs;
|
/***/ public String initFailedBareRepoDifferentDirs;
|
||||||
/***/ public String initFailedDirIsNoDirectory;
|
/***/ public String initFailedDirIsNoDirectory;
|
||||||
|
@ -424,7 +383,6 @@ public static JGitText get() {
|
||||||
/***/ public String invalidAncestryLength;
|
/***/ public String invalidAncestryLength;
|
||||||
/***/ public String invalidBooleanValue;
|
/***/ public String invalidBooleanValue;
|
||||||
/***/ public String invalidChannel;
|
/***/ public String invalidChannel;
|
||||||
/***/ public String invalidCharacterInBase64Data;
|
|
||||||
/***/ public String invalidCommitParentNumber;
|
/***/ public String invalidCommitParentNumber;
|
||||||
/***/ public String invalidDepth;
|
/***/ public String invalidDepth;
|
||||||
/***/ public String invalidEncryption;
|
/***/ public String invalidEncryption;
|
||||||
|
@ -449,10 +407,6 @@ public static JGitText get() {
|
||||||
/***/ public String invalidOldIdSent;
|
/***/ public String invalidOldIdSent;
|
||||||
/***/ public String invalidPacketLineHeader;
|
/***/ public String invalidPacketLineHeader;
|
||||||
/***/ public String invalidPath;
|
/***/ public String invalidPath;
|
||||||
/***/ public String invalidPathContainsSeparator;
|
|
||||||
/***/ public String invalidPathPeriodAtEndWindows;
|
|
||||||
/***/ public String invalidPathSpaceAtEndWindows;
|
|
||||||
/***/ public String invalidPathReservedOnWindows;
|
|
||||||
/***/ public String invalidPurgeFactor;
|
/***/ public String invalidPurgeFactor;
|
||||||
/***/ public String invalidRedirectLocation;
|
/***/ public String invalidRedirectLocation;
|
||||||
/***/ public String invalidRefAdvertisementLine;
|
/***/ public String invalidRefAdvertisementLine;
|
||||||
|
@ -495,7 +449,6 @@ public static JGitText get() {
|
||||||
/***/ public String lockFailedRetry;
|
/***/ public String lockFailedRetry;
|
||||||
/***/ public String lockOnNotClosed;
|
/***/ public String lockOnNotClosed;
|
||||||
/***/ public String lockOnNotHeld;
|
/***/ public String lockOnNotHeld;
|
||||||
/***/ public String malformedpersonIdentString;
|
|
||||||
/***/ public String maxCountMustBeNonNegative;
|
/***/ public String maxCountMustBeNonNegative;
|
||||||
/***/ public String mergeConflictOnNonNoteEntries;
|
/***/ public String mergeConflictOnNonNoteEntries;
|
||||||
/***/ public String mergeConflictOnNotes;
|
/***/ public String mergeConflictOnNotes;
|
||||||
|
@ -503,7 +456,6 @@ public static JGitText get() {
|
||||||
/***/ public String mergeStrategyDoesNotSupportHeads;
|
/***/ public String mergeStrategyDoesNotSupportHeads;
|
||||||
/***/ public String mergeUsingStrategyResultedInDescription;
|
/***/ public String mergeUsingStrategyResultedInDescription;
|
||||||
/***/ public String mergeRecursiveConflictsWhenMergingCommonAncestors;
|
/***/ public String mergeRecursiveConflictsWhenMergingCommonAncestors;
|
||||||
/***/ public String mergeRecursiveReturnedNoCommit;
|
|
||||||
/***/ public String mergeRecursiveTooManyMergeBasesFor;
|
/***/ public String mergeRecursiveTooManyMergeBasesFor;
|
||||||
/***/ public String messageAndTaggerNotAllowedInUnannotatedTags;
|
/***/ public String messageAndTaggerNotAllowedInUnannotatedTags;
|
||||||
/***/ public String minutesAgo;
|
/***/ public String minutesAgo;
|
||||||
|
@ -527,9 +479,6 @@ public static JGitText get() {
|
||||||
/***/ public String multipleMergeBasesFor;
|
/***/ public String multipleMergeBasesFor;
|
||||||
/***/ public String nameMustNotBeNullOrEmpty;
|
/***/ public String nameMustNotBeNullOrEmpty;
|
||||||
/***/ public String need2Arguments;
|
/***/ public String need2Arguments;
|
||||||
/***/ public String needPackOut;
|
|
||||||
/***/ public String needsAtLeastOneEntry;
|
|
||||||
/***/ public String needsWorkdir;
|
|
||||||
/***/ public String newIdMustNotBeNull;
|
/***/ public String newIdMustNotBeNull;
|
||||||
/***/ public String newlineInQuotesNotAllowed;
|
/***/ public String newlineInQuotesNotAllowed;
|
||||||
/***/ public String noApplyInDelete;
|
/***/ public String noApplyInDelete;
|
||||||
|
@ -559,16 +508,13 @@ public static JGitText get() {
|
||||||
/***/ public String notMergedExceptionMessage;
|
/***/ public String notMergedExceptionMessage;
|
||||||
/***/ public String noXMLParserAvailable;
|
/***/ public String noXMLParserAvailable;
|
||||||
/***/ public String objectAtHasBadZlibStream;
|
/***/ public String objectAtHasBadZlibStream;
|
||||||
/***/ public String objectAtPathDoesNotHaveId;
|
|
||||||
/***/ public String objectIsCorrupt;
|
/***/ public String objectIsCorrupt;
|
||||||
/***/ public String objectIsCorrupt3;
|
/***/ public String objectIsCorrupt3;
|
||||||
/***/ public String objectIsNotA;
|
/***/ public String objectIsNotA;
|
||||||
/***/ public String objectNotFound;
|
/***/ public String objectNotFound;
|
||||||
/***/ public String objectNotFoundIn;
|
/***/ public String objectNotFoundIn;
|
||||||
/***/ public String obtainingCommitsForCherryPick;
|
/***/ public String obtainingCommitsForCherryPick;
|
||||||
/***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack;
|
|
||||||
/***/ public String oldIdMustNotBeNull;
|
/***/ public String oldIdMustNotBeNull;
|
||||||
/***/ public String onlyAlreadyUpToDateAndFastForwardMergesAreAvailable;
|
|
||||||
/***/ public String onlyOneFetchSupported;
|
/***/ public String onlyOneFetchSupported;
|
||||||
/***/ public String onlyOneOperationCallPerConnectionIsSupported;
|
/***/ public String onlyOneOperationCallPerConnectionIsSupported;
|
||||||
/***/ public String openFilesMustBeAtLeast1;
|
/***/ public String openFilesMustBeAtLeast1;
|
||||||
|
@ -578,7 +524,6 @@ public static JGitText get() {
|
||||||
/***/ public String overflowedReftableBlock;
|
/***/ public String overflowedReftableBlock;
|
||||||
/***/ public String packChecksumMismatch;
|
/***/ public String packChecksumMismatch;
|
||||||
/***/ public String packCorruptedWhileWritingToFilesystem;
|
/***/ public String packCorruptedWhileWritingToFilesystem;
|
||||||
/***/ public String packDoesNotMatchIndex;
|
|
||||||
/***/ public String packedRefsHandleIsStale;
|
/***/ public String packedRefsHandleIsStale;
|
||||||
/***/ public String packetSizeMustBeAtLeast;
|
/***/ public String packetSizeMustBeAtLeast;
|
||||||
/***/ public String packetSizeMustBeAtMost;
|
/***/ public String packetSizeMustBeAtMost;
|
||||||
|
@ -600,7 +545,6 @@ public static JGitText get() {
|
||||||
/***/ public String panicCantRenameIndexFile;
|
/***/ public String panicCantRenameIndexFile;
|
||||||
/***/ public String patchApplyException;
|
/***/ public String patchApplyException;
|
||||||
/***/ public String patchFormatException;
|
/***/ public String patchFormatException;
|
||||||
/***/ public String pathIsNotInWorkingDir;
|
|
||||||
/***/ public String pathNotConfigured;
|
/***/ public String pathNotConfigured;
|
||||||
/***/ public String peeledLineBeforeRef;
|
/***/ public String peeledLineBeforeRef;
|
||||||
/***/ public String peeledRefIsRequired;
|
/***/ public String peeledRefIsRequired;
|
||||||
|
@ -613,7 +557,6 @@ public static JGitText get() {
|
||||||
/***/ public String propertyIsAlreadyNonNull;
|
/***/ public String propertyIsAlreadyNonNull;
|
||||||
/***/ public String pruneLoosePackedObjects;
|
/***/ public String pruneLoosePackedObjects;
|
||||||
/***/ public String pruneLooseUnreferencedObjects;
|
/***/ public String pruneLooseUnreferencedObjects;
|
||||||
/***/ public String pullOnRepoWithoutHEADCurrentlyNotSupported;
|
|
||||||
/***/ public String pullTaskName;
|
/***/ public String pullTaskName;
|
||||||
/***/ public String pushCancelled;
|
/***/ public String pushCancelled;
|
||||||
/***/ public String pushCertificateInvalidField;
|
/***/ public String pushCertificateInvalidField;
|
||||||
|
@ -699,7 +642,6 @@ public static JGitText get() {
|
||||||
/***/ public String shortSkipOfBlock;
|
/***/ public String shortSkipOfBlock;
|
||||||
/***/ public String signingNotSupportedOnTag;
|
/***/ public String signingNotSupportedOnTag;
|
||||||
/***/ public String similarityScoreMustBeWithinBounds;
|
/***/ public String similarityScoreMustBeWithinBounds;
|
||||||
/***/ public String sizeExceeds2GB;
|
|
||||||
/***/ public String skipMustBeNonNegative;
|
/***/ public String skipMustBeNonNegative;
|
||||||
/***/ public String smartHTTPPushDisabled;
|
/***/ public String smartHTTPPushDisabled;
|
||||||
/***/ public String sourceDestinationMustMatch;
|
/***/ public String sourceDestinationMustMatch;
|
||||||
|
@ -720,7 +662,6 @@ public static JGitText get() {
|
||||||
/***/ public String staleRevFlagsOn;
|
/***/ public String staleRevFlagsOn;
|
||||||
/***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;
|
/***/ public String startingReadStageWithoutWrittenRequestDataPendingIsNotSupported;
|
||||||
/***/ public String stashApplyConflict;
|
/***/ public String stashApplyConflict;
|
||||||
/***/ public String stashApplyConflictInIndex;
|
|
||||||
/***/ public String stashApplyFailed;
|
/***/ public String stashApplyFailed;
|
||||||
/***/ public String stashApplyWithoutHead;
|
/***/ public String stashApplyWithoutHead;
|
||||||
/***/ public String stashApplyOnUnsafeRepository;
|
/***/ public String stashApplyOnUnsafeRepository;
|
||||||
|
@ -761,7 +702,6 @@ public static JGitText get() {
|
||||||
/***/ public String transportExceptionMissingAssumed;
|
/***/ public String transportExceptionMissingAssumed;
|
||||||
/***/ public String transportExceptionReadRef;
|
/***/ public String transportExceptionReadRef;
|
||||||
/***/ public String transportNeedsRepository;
|
/***/ public String transportNeedsRepository;
|
||||||
/***/ public String transportProtoAmazonS3;
|
|
||||||
/***/ public String transportProtoBundleFile;
|
/***/ public String transportProtoBundleFile;
|
||||||
/***/ public String transportProtoFTP;
|
/***/ public String transportProtoFTP;
|
||||||
/***/ public String transportProtoGitAnon;
|
/***/ public String transportProtoGitAnon;
|
||||||
|
@ -774,7 +714,6 @@ public static JGitText get() {
|
||||||
/***/ public String transportSSHRetryInterrupt;
|
/***/ public String transportSSHRetryInterrupt;
|
||||||
/***/ public String treeEntryAlreadyExists;
|
/***/ public String treeEntryAlreadyExists;
|
||||||
/***/ public String treeFilterMarkerTooManyFilters;
|
/***/ public String treeFilterMarkerTooManyFilters;
|
||||||
/***/ public String treeIteratorDoesNotSupportRemove;
|
|
||||||
/***/ public String treeWalkMustHaveExactlyTwoTrees;
|
/***/ public String treeWalkMustHaveExactlyTwoTrees;
|
||||||
/***/ public String truncatedHunkLinesMissingForAncestor;
|
/***/ public String truncatedHunkLinesMissingForAncestor;
|
||||||
/***/ public String truncatedHunkNewLinesMissing;
|
/***/ public String truncatedHunkNewLinesMissing;
|
||||||
|
@ -784,10 +723,8 @@ public static JGitText get() {
|
||||||
/***/ public String unableToCreateNewObject;
|
/***/ public String unableToCreateNewObject;
|
||||||
/***/ public String unableToReadPackfile;
|
/***/ public String unableToReadPackfile;
|
||||||
/***/ public String unableToRemovePath;
|
/***/ public String unableToRemovePath;
|
||||||
/***/ public String unableToStore;
|
|
||||||
/***/ public String unableToWrite;
|
/***/ public String unableToWrite;
|
||||||
/***/ public String unauthorized;
|
/***/ public String unauthorized;
|
||||||
/***/ public String underflowedReftableBlock;
|
|
||||||
/***/ public String unencodeableFile;
|
/***/ public String unencodeableFile;
|
||||||
/***/ public String unexpectedCompareResult;
|
/***/ public String unexpectedCompareResult;
|
||||||
/***/ public String unexpectedEndOfConfigFile;
|
/***/ public String unexpectedEndOfConfigFile;
|
||||||
|
@ -803,7 +740,6 @@ public static JGitText get() {
|
||||||
/***/ public String unknownOrUnsupportedCommand;
|
/***/ public String unknownOrUnsupportedCommand;
|
||||||
/***/ public String unknownDIRCVersion;
|
/***/ public String unknownDIRCVersion;
|
||||||
/***/ public String unknownHost;
|
/***/ public String unknownHost;
|
||||||
/***/ public String unknownIndexVersionOrCorruptIndex;
|
|
||||||
/***/ public String unknownObject;
|
/***/ public String unknownObject;
|
||||||
/***/ public String unknownObjectInIndex;
|
/***/ public String unknownObjectInIndex;
|
||||||
/***/ public String unknownObjectType;
|
/***/ public String unknownObjectType;
|
||||||
|
|
Loading…
Reference in New Issue