From d9e67c8d8f4c1ae2e96f6bfaa147d432979e93d6 Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sat, 27 Oct 2018 21:55:39 +0200 Subject: [PATCH] Fix typos s/occured/occurred/ s/stablished/established/ Change-Id: Ib052bef60bd18043001a30ed43754ee1a5182016 Signed-off-by: Michael Keppler Signed-off-by: Matthias Sohn --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 4 ++-- .../src/org/eclipse/jgit/attributes/FilterCommand.java | 2 +- .../src/org/eclipse/jgit/transport/UploadPack.java | 4 ++-- 3 files changed, 5 insertions(+), 5 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 311d68b39..b0fe0526d 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -302,7 +302,7 @@ expectedPktLineWithService=expected pkt-line with ''# service=-'', got ''{0}'' expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1} expectedReportForRefNotReceived={0}: expected report for ref {1} not received failedAtomicFileCreation=Atomic file creation failed, number of hard links to file {0} was not 2 but {1}" -failedToDetermineFilterDefinition=An exception occured while determining filter definitions +failedToDetermineFilterDefinition=An exception occurred while determining filter definitions failedUpdatingRefs=failed updating refs failureDueToOneOfTheFollowing=Failure due to one of the following: failureUpdatingFETCH_HEAD=Failure updating FETCH_HEAD: {0} @@ -638,7 +638,7 @@ sourceRefNotSpecifiedForRefspec=Source ref not specified for refspec: {0} squashCommitNotUpdatingHEAD=Squash commit -- not updating HEAD sshCommandFailed=Execution of ssh command ''{0}'' failed with error ''{1}'' sshUserNameError=Jsch error: failed to set SSH user name correctly to ''{0}''; using ''{1}'' picked up from SSH config file. -sslFailureExceptionMessage=Secure connection to {0} could not be stablished because of SSL problems +sslFailureExceptionMessage=Secure connection to {0} could not be established because of SSL problems sslFailureInfo=A secure connection to {0}\ncould not be established because the server''s certificate could not be validated. sslFailureCause=SSL reported: {0} sslFailureTrustExplanation=Do you want to skip SSL verification for this server? diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/FilterCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/FilterCommand.java index c4357d129..0bb451629 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/FilterCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/FilterCommand.java @@ -95,7 +95,7 @@ public FilterCommand(InputStream in, OutputStream out) { * -1. -1 means that the {@link java.io.InputStream} is completely * processed. * @throws java.io.IOException - * when {@link java.io.IOException} occured while reading from + * when {@link java.io.IOException} occurred while reading from * {@link #in} or writing to {@link #out} */ public abstract int run() throws IOException; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index f7af98088..e6e366567 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -1808,7 +1808,7 @@ private boolean wantSatisfied(RevObject want) throws IOException { * @param deepenNots * objects that the client specified using --shallow-exclude * @throws IOException - * if an error occured while generating or writing the pack. + * if an error occurred while generating or writing the pack. */ private void sendPack(PackStatistics.Accumulator accumulator, FetchRequest req, @@ -1880,7 +1880,7 @@ private boolean reportInternalServerErrorOverSideband() { * @param deepenNots * objects that the client specified using --shallow-exclude * @throws IOException - * if an error occured while generating or writing the pack. + * if an error occurred while generating or writing the pack. */ private void sendPack(final boolean sideband, FetchRequest req,