aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2014-06-21 01:28:55 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2014-06-21 01:28:55 +0200
commit64dde09b8524a92230bacd93b2bb86e4ceab741f (patch)
treed6d601cae52e68c317469969f44f9069f7161445 /org.eclipse.jgit/resources
parent79792c59b663072820c442d0a2d34a9c5de27cf9 (diff)
parent7865d7100e2a5f9d02f6679daada0c64ae14935f (diff)
downloadjgit-64dde09b8524a92230bacd93b2bb86e4ceab741f.tar.gz
jgit-64dde09b8524a92230bacd93b2bb86e4ceab741f.zip
Merge branch 'stable-3.4'
* stable-3.4: Prepare 3.4.2-SNAPSHOT builds JGit v3.4.1.201406201815-r Allow retrying connecting SshSession in case of an exception Change-Id: I7efb009b9e012637a16c57e2e93e074023b8e46c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties1
1 files changed, 1 insertions, 0 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 fd5801e6a5..5b12a0c688 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -508,6 +508,7 @@ transportProtoHTTP=HTTP
transportProtoLocal=Local Git Repository
transportProtoSFTP=SFTP
transportProtoSSH=SSH
+transportSSHRetryInterrupt=Interrupted while waiting for retry
treeEntryAlreadyExists=Tree entry "{0}" already exists.
treeFilterMarkerTooManyFilters=Too many markTreeFilters passed, maximum number is {0} (passed {1})
treeIteratorDoesNotSupportRemove=TreeIterator does not support remove()