diff --git a/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties b/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties index 0e2023cbd..fd0b98a72 100644 --- a/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties +++ b/org.eclipse.jgit.lfs/resources/org/eclipse/jgit/lfs/internal/LfsText.properties @@ -1,20 +1,19 @@ corruptLongObject=The content hash ''{0}'' of the long object ''{1}'' doesn''t match its id, the corrupt object will be deleted. -incorrectLONG_OBJECT_ID_LENGTH=Incorrect LONG_OBJECT_ID_LENGTH. -inconsistentMediafileLength=Mediafile {0} has unexpected length; expected {1} but found {2}. +dotLfsConfigReadFailed=Reading .lfsconfig failed inconsistentContentLength=Unexpected content length reported by LFS server ({0}), expected {1} but reported was {2} +inconsistentMediafileLength=Mediafile {0} has unexpected length; expected {1} but found {2}. +incorrectLONG_OBJECT_ID_LENGTH=Incorrect LONG_OBJECT_ID_LENGTH. invalidLongId=Invalid id: {0} invalidLongIdLength=Invalid id length {0}; should be {1} -lfsUnavailable=LFS is not available for repository {0} -protocolError=LFS Protocol Error {0}: {1} -requiredHashFunctionNotAvailable=Required hash function {0} not available. -repositoryNotFound=Repository {0} not found -repositoryReadOnly=Repository {0} is read-only -lfsUnavailable=LFS is not available for repository {0} -lfsUnathorized=Not authorized to perform operation {0} on repository {1} lfsFailedToGetRepository=failed to get repository {0} lfsNoDownloadUrl="Need to download object from LFS server but couldn't determine LFS server URL" -serverFailure=When trying to open a connection to {0} the server responded with an error code. rc={1} -wrongAmoutOfDataReceived=While downloading data from the content server {0} {1} bytes have been received while {2} have been expected -userConfigInvalid="User config file {0} invalid {1}" +lfsUnathorized=Not authorized to perform operation {0} on repository {1} +lfsUnavailable=LFS is not available for repository {0} missingLocalObject="Local Object {0} is missing" -dotLfsConfigReadFailed=Reading .lfsconfig failed \ No newline at end of file +protocolError=LFS Protocol Error {0}: {1} +repositoryNotFound=Repository {0} not found +repositoryReadOnly=Repository {0} is read-only +requiredHashFunctionNotAvailable=Required hash function {0} not available. +serverFailure=When trying to open a connection to {0} the server responded with an error code. rc={1} +userConfigInvalid="User config file {0} invalid {1}" +wrongAmoutOfDataReceived=While downloading data from the content server {0} {1} bytes have been received while {2} have been expected \ No newline at end of file diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java index 22813ff64..469f80baf 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java @@ -28,22 +28,22 @@ public static LfsText get() { // @formatter:off /***/ public String corruptLongObject; - /***/ public String inconsistentMediafileLength; + /***/ public String dotLfsConfigReadFailed; /***/ public String inconsistentContentLength; + /***/ public String inconsistentMediafileLength; /***/ public String incorrectLONG_OBJECT_ID_LENGTH; /***/ public String invalidLongId; /***/ public String invalidLongIdLength; - /***/ public String lfsUnavailable; - /***/ public String protocolError; - /***/ public String requiredHashFunctionNotAvailable; - /***/ public String repositoryNotFound; - /***/ public String repositoryReadOnly; - /***/ public String lfsUnathorized; /***/ public String lfsFailedToGetRepository; /***/ public String lfsNoDownloadUrl; - /***/ public String serverFailure; - /***/ public String wrongAmoutOfDataReceived; - /***/ public String userConfigInvalid; + /***/ public String lfsUnathorized; + /***/ public String lfsUnavailable; /***/ public String missingLocalObject; - /***/ public String dotLfsConfigReadFailed; + /***/ public String protocolError; + /***/ public String repositoryNotFound; + /***/ public String repositoryReadOnly; + /***/ public String requiredHashFunctionNotAvailable; + /***/ public String serverFailure; + /***/ public String userConfigInvalid; + /***/ public String wrongAmoutOfDataReceived; }