This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7ae707f391b10437cb1f0be781229bd181de4b89
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 17:10:04 2020 +0100
More spelling fixes for org.apache.catalina
---
java/org/apache/catalina/manager/LocalStrings.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ko.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_ru.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/manager/StatusManagerServlet.java | 2 +-
java/org/apache/catalina/servlets/LocalStrings.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings_es.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings_ja.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings_ko.properties | 2 +-
java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
.../catalina/tribes/group/interceptors/NonBlockingCoordinator.java | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties
b/java/org/apache/catalina/manager/LocalStrings.properties
index 51bffb4..ea0e75c 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=Applications
htmlManagerServlet.appsUndeploy=Undeploy
htmlManagerServlet.appsVersion=Version
htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
-htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
+htmlManagerServlet.connectorStateBytesReceived=Bytes received:
htmlManagerServlet.connectorStateBytesSent=Bytes sent:
htmlManagerServlet.connectorStateErrorCount=Error count:
htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service
F: Finishing R: Ready K: Keepalive
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 1f2c996..22a084a 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=Applications
htmlManagerServlet.appsUndeploy=Retirer
htmlManagerServlet.appsVersion=Version
htmlManagerServlet.connectorStateAliveSocketCount=Nombre de sockets connectés :
-htmlManagerServlet.connectorStateBytesRecieved=Octets reçus :
+htmlManagerServlet.connectorStateBytesReceived=Octets reçus :
htmlManagerServlet.connectorStateBytesSent=Octets envoyés :
htmlManagerServlet.connectorStateErrorCount=Nombre d'erreurs :
htmlManagerServlet.connectorStateHint=P : Traitement et préparation de la
requête S : Service F : Fin R : Prêt K : Connecté
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 48526f7..080c1d0 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=アプリケーション
htmlManagerServlet.appsUndeploy=配備解除
htmlManagerServlet.appsVersion=バージョン
htmlManagerServlet.connectorStateAliveSocketCount=キープアライブソケット数：
-htmlManagerServlet.connectorStateBytesRecieved=受信バイト数：
+htmlManagerServlet.connectorStateBytesReceived=受信バイト数：
htmlManagerServlet.connectorStateBytesSent=送信バイト：
htmlManagerServlet.connectorStateErrorCount=エラー数：
htmlManagerServlet.connectorStateHint=P：パースとリクエスト準備 S：サービス F：終了 R：Ready
K：キープアライブ
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 921ffa3..533767f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=애플리케이션들
htmlManagerServlet.appsUndeploy=배치된 것을 제거
htmlManagerServlet.appsVersion=버전
htmlManagerServlet.connectorStateAliveSocketCount=Keep alive 소켓 개수:
-htmlManagerServlet.connectorStateBytesRecieved=수신된 바이트 크기:
+htmlManagerServlet.connectorStateBytesReceived=수신된 바이트 크기:
htmlManagerServlet.connectorStateBytesSent=전송된 바이트 크기:
htmlManagerServlet.connectorStateErrorCount=오류 개수:
htmlManagerServlet.connectorStateHint=P: 요청을 파싱 또는 준비, S: 서비스, F: 완료 R: 준비 K:
Keepalive
diff --git a/java/org/apache/catalina/manager/LocalStrings_ru.properties
b/java/org/apache/catalina/manager/LocalStrings_ru.properties
index 8d165d9..dbcff6e 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ru.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=Приложения
htmlManagerServlet.appsUndeploy=Удалить
htmlManagerServlet.appsVersion=Версия
htmlManagerServlet.connectorStateAliveSocketCount=Количество всё ещё живых
сокетов:
-htmlManagerServlet.connectorStateBytesRecieved=Байтов получено:
+htmlManagerServlet.connectorStateBytesReceived=Байтов получено:
htmlManagerServlet.connectorStateBytesSent=Байтов отправлено:
htmlManagerServlet.connectorStateErrorCount=Количество ошибок:
htmlManagerServlet.connectorStateHint=P: Разбирается и готовится к обработке,
S: Сервис, F: Завершение, R: Готов, K: Продолжает существовать
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 64ee889..60bf664 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -26,7 +26,7 @@ htmlManagerServlet.appsTitle=应用程序
htmlManagerServlet.appsUndeploy=卸载
htmlManagerServlet.appsVersion=版本号
htmlManagerServlet.connectorStateAliveSocketCount=存活套接字总数：
-htmlManagerServlet.connectorStateBytesRecieved=收到字节：
+htmlManagerServlet.connectorStateBytesReceived=收到字节：
htmlManagerServlet.connectorStateBytesSent=发送.字节:
htmlManagerServlet.connectorStateErrorCount=错误数：
htmlManagerServlet.connectorStateHint=P：解析和准备request S：服务 F：结束 R：就绪 K：存活
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java
b/java/org/apache/catalina/manager/StatusManagerServlet.java
index ef3d200..93f7d3e 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -323,7 +323,7 @@ public class StatusManagerServlet
args[5] =
smClient.getString("htmlManagerServlet.connectorStateProcessingTime");
args[6] =
smClient.getString("htmlManagerServlet.connectorStateRequestCount");
args[7] =
smClient.getString("htmlManagerServlet.connectorStateErrorCount");
- args[8] =
smClient.getString("htmlManagerServlet.connectorStateBytesRecieved");
+ args[8] =
smClient.getString("htmlManagerServlet.connectorStateBytesReceived");
args[9] =
smClient.getString("htmlManagerServlet.connectorStateBytesSent");
args[10] =
smClient.getString("htmlManagerServlet.connectorStateTableTitleStage");
args[11] =
smClient.getString("htmlManagerServlet.connectorStateTableTitleTime");
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index 13a9d40..91a54f1 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -49,5 +49,5 @@ directory.parent=Up To [{0}]
directory.size=Size
directory.title=Directory Listing For [{0}]
-webdavservlet.enternalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
+webdavservlet.externalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
webdavservlet.jaxpfailed=JAXP initialization failed
diff --git a/java/org/apache/catalina/servlets/LocalStrings_es.properties
b/java/org/apache/catalina/servlets/LocalStrings_es.properties
index c96df05..d56dc2c 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_es.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_es.properties
@@ -32,5 +32,5 @@ directory.parent=Atrás A [{0}]
directory.size=Medida
directory.title=Listado de Directorio Para [{0}]
-webdavservlet.enternalEntityIgnored=El requerimiento incluía una referencia a
una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
+webdavservlet.externalEntityIgnored=El requerimiento incluía una referencia a
una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
webdavservlet.jaxpfailed=Falló la inicialización de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
index 3eff3f9..331bddf 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_fr.properties
@@ -49,5 +49,5 @@ directory.parent=Jusqu''à [{0}]
directory.size=Taille
directory.title=Liste du répertoire pour [{0}]
-webdavservlet.enternalEntityIgnored=La requête a inclus une référence à une
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
+webdavservlet.externalEntityIgnored=La requête a inclus une référence à une
entité externe avec publicId [{0}] et systemId [{1}] qui a été ignorée
webdavservlet.jaxpfailed=Erreur d'initialisation de JAXP
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
index 2432ba6..cbf8943 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ja.properties
@@ -49,5 +49,5 @@ directory.parent=[{0}] に移動
directory.size=サイズ
directory.title=[{0}] のディレクトリの一覧
-webdavservlet.enternalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
+webdavservlet.externalEntityIgnored=PublicID [{0}]およびSystemID
[{1}]を持つ外部エンティティへの参照を含むリクエストが無視されました
webdavservlet.jaxpfailed=JAXPの初期化に失敗しました
diff --git a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
index f686f2d..abb719c 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_ko.properties
@@ -49,5 +49,5 @@ directory.parent=상위로: [{0}]
directory.size=크기
directory.title=[{0}]을(를) 위한 디렉토리 목록 표시
-webdavservlet.enternalEntityIgnored=요청이, PublicID가 [{0}]이고 SystemID가 [{1}]인 외부
엔티티에 대한 참조를 포함했는데, 이는 무시되었습니다.
+webdavservlet.externalEntityIgnored=요청이, PublicID가 [{0}]이고 SystemID가 [{1}]인 외부
엔티티에 대한 참조를 포함했는데, 이는 무시되었습니다.
webdavservlet.jaxpfailed=JAXP의 초기화가 실패했습니다.
diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index 9d1c47d..e24a6d1 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -49,5 +49,5 @@ directory.parent=最多[{0}]
directory.size=大小
directory.title=[{0}]的目录列表
-webdavservlet.enternalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用，该引用被忽略。
+webdavservlet.externalEntityIgnored=请求包含对PublicID[{0}]和SystemID[{1}]的外部实体的引用，该引用被忽略。
webdavservlet.jaxpfailed=JAXP 初始化失败
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index d8642ba..fb2e70c 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2641,7 +2641,7 @@ public class WebdavServlet extends DefaultServlet {
@Override
public InputSource resolveEntity (String publicId, String systemId) {
- context.log(sm.getString("webdavservlet.enternalEntityIgnored",
+ context.log(sm.getString("webdavservlet.externalEntityIgnored",
publicId, systemId));
return new InputSource(
new StringReader("Ignored external entity"));
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index 0ecb9c7..e4bde70 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -40,7 +40,7 @@ import org.apache.juli.logging.LogFactory;
* <p>Title: Auto merging leader election algorithm</p>
*
* <p>Description: Implementation of a simple coordinator algorithm that not
only selects a coordinator,
- * it also merges groups automatically when members are discovered that
werent part of the
+ * it also merges groups automatically when members are discovered that
weren't part of the
* </p>
* <p>This algorithm is non blocking meaning it allows for transactions while
the coordination phase is going on
* </p>
@@ -850,4 +850,4 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
