You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/10/30 12:41:29 UTC
[tomcat] branch 9.0.x updated (3f2df25 -> 8476f85)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 3f2df25 Avoid most of the thread pool use during NIO2 socket accept
new f55c714 Align with 10.0.x
new 8476f85 Back-port i18n updates
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jaspic/LocalStrings_fr.properties | 2 ++
.../jaspic/LocalStrings_ko.properties | 2 ++
.../jaspic/LocalStrings_ru.properties | 2 ++
.../catalina/core/LocalStrings_ru.properties | 7 ++++++
.../tcp}/LocalStrings_ru.properties | 2 +-
.../catalina/loader/LocalStrings_fr.properties | 1 +
.../catalina/loader/LocalStrings_ko.properties | 1 +
.../catalina/loader/LocalStrings_ru.properties | 1 +
.../catalina/realm/LocalStrings_ru.properties | 1 +
.../catalina/session/LocalStrings_fr.properties | 1 +
.../catalina/session/LocalStrings_ko.properties | 1 +
.../LocalStrings_ru.properties | 2 +-
.../catalina/startup/LocalStrings_de.properties | 10 ++++----
.../catalina/startup/LocalStrings_es.properties | 21 ++++++++++++-----
.../catalina/startup/LocalStrings_fr.properties | 27 +++++++++++-----------
.../catalina/startup/LocalStrings_ko.properties | 27 +++++++++++-----------
.../catalina/startup/LocalStrings_ru.properties | 7 ++++++
.../catalina/startup/LocalStrings_zh_CN.properties | 8 +++----
.../group/interceptors/LocalStrings_ru.properties | 2 ++
.../catalina/util/LocalStrings_ru.properties | 2 ++
.../catalina/valves/LocalStrings_ko.properties | 2 ++
.../catalina/valves/LocalStrings_ru.properties | 1 +
java/org/apache/coyote/LocalStrings_ko.properties | 2 ++
.../coyote/http11/LocalStrings_ru.properties | 1 +
.../http11/filters}/LocalStrings_ru.properties | 2 +-
.../apache/coyote/http2/LocalStrings_fr.properties | 1 +
.../apache/coyote/http2/LocalStrings_ko.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties | 5 ++++
.../apache/tomcat/util/LocalStrings_ru.properties | 1 +
.../util/digester}/LocalStrings_ru.properties | 2 +-
.../apache/tomcat/util/net/LocalStrings.properties | 2 +-
.../tomcat/util/net/LocalStrings_ko.properties | 1 +
.../tomcat/util/net/LocalStrings_ru.properties | 3 +++
.../util/net/openssl/LocalStrings_ru.properties | 2 ++
.../tomcat/websocket/LocalStrings_ko.properties | 5 ++++
webapps/docs/changelog.xml | 13 +++++++++++
36 files changed, 126 insertions(+), 47 deletions(-)
copy java/org/apache/catalina/{connector => ha/tcp}/LocalStrings_ru.properties (88%)
copy java/org/apache/catalina/{connector => session}/LocalStrings_ru.properties (88%)
copy java/org/apache/{catalina/authenticator/jaspic => coyote/http11/filters}/LocalStrings_ru.properties (78%)
copy java/org/apache/{catalina/connector => tomcat/util/digester}/LocalStrings_ru.properties (86%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 10.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f55c714b2bd34e08ee5f59649fa689b48734728e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 30 12:38:17 2020 +0000
Align with 10.0.x
---
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 577fa36..cf717c9 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-acceptor.stop.fail= The acceptor thread [{0}] did not stop cleanly
+acceptor.stop.fail=The acceptor thread [{0}] did not stop cleanly
acceptor.stop.interrupted=Interrupt was received while waiting for the acceptor thread [{0}] to stop
channel.nio.interrupted=The current thread was interrupted
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Back-port i18n updates
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8476f85ba27d51146b941f642a80a2f005525e7e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 30 12:41:06 2020 +0000
Back-port i18n updates
---
.../jaspic/LocalStrings_fr.properties | 2 ++
.../jaspic/LocalStrings_ko.properties | 2 ++
.../jaspic/LocalStrings_ru.properties | 2 ++
.../catalina/core/LocalStrings_ru.properties | 7 ++++++
.../{loader => ha/tcp}/LocalStrings_ru.properties | 2 +-
.../catalina/loader/LocalStrings_fr.properties | 1 +
.../catalina/loader/LocalStrings_ko.properties | 1 +
.../catalina/loader/LocalStrings_ru.properties | 1 +
.../catalina/realm/LocalStrings_ru.properties | 1 +
.../catalina/session/LocalStrings_fr.properties | 1 +
.../catalina/session/LocalStrings_ko.properties | 1 +
.../{loader => session}/LocalStrings_ru.properties | 2 +-
.../catalina/startup/LocalStrings_de.properties | 10 ++++----
.../catalina/startup/LocalStrings_es.properties | 21 ++++++++++++-----
.../catalina/startup/LocalStrings_fr.properties | 27 +++++++++++-----------
.../catalina/startup/LocalStrings_ko.properties | 27 +++++++++++-----------
.../catalina/startup/LocalStrings_ru.properties | 7 ++++++
.../catalina/startup/LocalStrings_zh_CN.properties | 8 +++----
.../group/interceptors/LocalStrings_ru.properties | 2 ++
.../catalina/util/LocalStrings_ru.properties | 2 ++
.../catalina/valves/LocalStrings_ko.properties | 2 ++
.../catalina/valves/LocalStrings_ru.properties | 1 +
java/org/apache/coyote/LocalStrings_ko.properties | 2 ++
.../coyote/http11/LocalStrings_ru.properties | 1 +
.../http11/filters}/LocalStrings_ru.properties | 2 +-
.../apache/coyote/http2/LocalStrings_fr.properties | 1 +
.../apache/coyote/http2/LocalStrings_ko.properties | 3 +++
.../jasper/resources/LocalStrings_ru.properties | 5 ++++
.../apache/tomcat/util/LocalStrings_ru.properties | 1 +
.../util/digester}/LocalStrings_ru.properties | 2 +-
.../tomcat/util/net/LocalStrings_ko.properties | 1 +
.../tomcat/util/net/LocalStrings_ru.properties | 3 +++
.../util/net/openssl/LocalStrings_ru.properties | 2 ++
.../tomcat/websocket/LocalStrings_ko.properties | 5 ++++
webapps/docs/changelog.xml | 13 +++++++++++
35 files changed, 125 insertions(+), 46 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_fr.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_fr.properties
index 53fac21..0b3335d 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_fr.properties
@@ -19,7 +19,9 @@ authConfigFactoryImpl.registerInstance=Enregistrement de l''instance de type [{0
authConfigFactoryImpl.zeroLengthAppContext=Un nom de contexte vide n'est pas valide
authConfigFactoryImpl.zeroLengthMessageLayer=Un message vide de nom de couche est invalide
+callbackHandlerImpl.containerMissing=Le rappel (callback) JASPIC de type [{0}] a un conteneur manquant et a été ignoré
callbackHandlerImpl.jaspicCallbackMissing=Le rappel (callback) JASPIC de type [{0}] reçu n''est pas supporté et a été ignoré
+callbackHandlerImpl.realmMissing=Le rappel (callback) JASPIC de type [{0}] reçu n''a pas de royaume (realm) et a été ignoré
jaspicAuthenticator.authenticate=Authentification de la requête pour [{0}] avec JASPIC
diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties
index 10a28dd..01678ec 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ko.properties
@@ -19,7 +19,9 @@ authConfigFactoryImpl.registerInstance=레이어 [{1}]와(과) 애플리케이
authConfigFactoryImpl.zeroLengthAppContext=애플리케이션 컨텍스트 이름의 길이가 0으로, 이는 유효하지 않습니다.
authConfigFactoryImpl.zeroLengthMessageLayer=길이가 0인 메시지 레이어 이름은 유효하지 않습니다.
+callbackHandlerImpl.containerMissing=타입이 [{0}]인 JASPIC 콜백을 위한 컨테이너가 존재하지 않아 무시됩니다.
callbackHandlerImpl.jaspicCallbackMissing=타입이 [{0}]인 지원되지 않는 JASPIC 콜백을 받았는데, 이는 무시됩니다.
+callbackHandlerImpl.realmMissing=컨테이너 [{1}]에 타입이 [{0}]인 JASPIC 콜백을 위한 Realm이 존재하지 않아 무시됩니다.
jaspicAuthenticator.authenticate=[{0}]을(를) 위한 요청을 JASPIC를 통하여 인증합니다.
diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
index 879f293..af9a981 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_ru.properties
@@ -13,4 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+authConfigFactoryImpl.zeroLengthAppContext=Название контекста приложения нулевой длины является недействительным
+
persistentProviderRegistrations.existsDeleteFail=Временный файл [{0}] уже существует и не может быть удалён
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 6759ce9..337fef3 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -15,8 +15,15 @@
applicationContext.addJspFile.iae=Файл JSP [{0}] содержит ошибки
applicationContext.addListener.iae.cnfe=Невозможно создать экземпляр типа [{0}]
+applicationContext.addListener.iae.wrongType=Указанный тип[{0}] не является одним из ожидаемых типов слушателей
applicationContext.setAttribute.namenull=Имя не может быть пустым
+aprListener.initializingFIPS=Инициализируется режим FIPS...
+
+filterChain.filter=При выполнении фильтра выброшено исключение
+
+standardContext.securityConstraint.mixHttpMethod=Запрещено смешивать <http-method> и <http-method-omission> в одной и той же коллекции веб-ресурсов
+
standardWrapper.allocate=Ошибка при выделении экземпляра сервлета
standardWrapper.allocateException=Ошибка выделения для сервлета [{0}]
standardWrapper.deallocateException=Ошибка освобождения для сервлета [{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
similarity index 88%
copy from java/org/apache/catalina/loader/LocalStrings_ru.properties
copy to java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index a851ce0..08673fa 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webappClassLoader.checkThreadLocalsForLeaks.unknown=Неизвестно
+ReplicationValve.filter.failure=Не возможно скомпилировать фильтрr=[{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_fr.properties b/java/org/apache/catalina/loader/LocalStrings_fr.properties
index e23c9f2..7f29901 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+webappClassLoader.addExportsJavaIo=Lorsque Java 9 ou ultérieur est utilisé, "--add-opens=java.base/java.io={0}" doit être ajouté aux arguments de la ligne de commande de la JVM pour activer la protection contre les fuites de mémoire du cache de ObjectStream; cet avertissement peut aussi être supprimé en désactivant cette protection
webappClassLoader.addExportsRmi=Quand Java 9 est utilisé, il faut utiliser "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" sur la ligne de commande de la JVM pour activer la détection de fuites de mémoire des cibles RMI ; sinon cet avertissement peut être supprimé en désactivant cette détection
webappClassLoader.addExportsThreadLocal=Quand Java 9 est utilisé, il faut utiliser "--add-opens=java.base/java.lang=ALL-UNNAMED" sur la ligne de commande de la JVM pour activer la détection de fuites de mémoire des ThreadLocal ; sinon cet avertissement peut être supprimé en désactivant cette détection
webappClassLoader.addPermissionNoCanonicalFile=Impossible d’obtenir le chemin de fichier canonique pour l''URL [{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ko.properties b/java/org/apache/catalina/loader/LocalStrings_ko.properties
index 2f4bce7..d6c4b62 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ko.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+webappClassLoader.addExportsJavaIo=Java 9 또는 이후 버전을 사용할 때에는, "--add-opens=java.base/java.io={0}" 을(를) JVM 명령행 아규먼트들에 추가해서, ObjectStream 캐시 메모리 릭 방지 옵션을 활성화할 필요가 있습니다. 또는 원하시는 경우, ObjectStream 클래스 캐시 메모리 릭 방지 옵션을 비활성화해서 이 경고 메시지를 없앨 수도 있습니다.
webappClassLoader.addExportsRmi=Java 9에서 실행하면서 RMI Target 메모리 누수 탐지를 사용 가능하게 하려면, "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"를 JVM 명령 행 아규먼트에 추가해야 합니다. 또는, RMI Target 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고를 없앨 수도 있습니다.
webappClassLoader.addExportsThreadLocal=Java 9 환경에서 실행할 때에는, ThreadLocal 메모리 누수 탐지를 위하여, "--add-opens=java.base/java.lang=ALL-UNNAMED"를 JVM 명령 행 아규먼트들에 추가해야 합니다. 또는, ThreadLocal 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고 메시지를 없앨 수도 있습니다.
webappClassLoader.addPermissionNoCanonicalFile=URL [{0}](으)로부터 canonical 파일 경로를 얻을 수 없습니다.
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties b/java/org/apache/catalina/loader/LocalStrings_ru.properties
index a851ce0..c3f8d0e 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ru.properties
@@ -14,3 +14,4 @@
# limitations under the License.
webappClassLoader.checkThreadLocalsForLeaks.unknown=Неизвестно
+webappClassLoader.readError=Ошибка чтения ресурса: Не возможно загрузить [{0}].
diff --git a/java/org/apache/catalina/realm/LocalStrings_ru.properties b/java/org/apache/catalina/realm/LocalStrings_ru.properties
index 7e9601c..140c5b7 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ru.properties
@@ -15,4 +15,5 @@
lockOutRealm.authLockedUser=Заблокированный пользователь [{0}] совершил попытку авторизоваться
+realmBase.createUsernameRetriever.ClassCastException=Класс [{0}] не является X509UsernameRetriever.
realmBase.forbidden=Доступ к запрашиваемому ресурсу был заблокирован
diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index a4a88c3..efdd83d 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -20,6 +20,7 @@ JDBCStore.checkConnectionDBReOpenFail=La tentative de réouverture de la base de
JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite [{0}]
JDBCStore.close=Exception lors de la fermeture de la connection vers la base de donnée [{0}]
JDBCStore.commitSQLException=Une SQLException a été retournée lors du commit de la connection avant sa fermeture
+JDBCStore.connectError=Impossible de se connecter à la base de données [{0}]
JDBCStore.loading=Chargement de la Session [{0}] depuis la base de données [{1}]
JDBCStore.missingDataSourceName=Aucun nom JNDI valide n'a été donné.
JDBCStore.removing=Retrait de la Session [{0}] de la base de données [{1}]
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties b/java/org/apache/catalina/session/LocalStrings_ko.properties
index d12d230..2f6a0a0 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -20,6 +20,7 @@ JDBCStore.checkConnectionDBReOpenFail=데이터베이스에 대해 다시 연결
JDBCStore.checkConnectionSQLException=SQL 예외 발생 [{0}]
JDBCStore.close=데이터베이스 연결 [{0}]을(를) 닫는 동안 예외 발생
JDBCStore.commitSQLException=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
+JDBCStore.connectError=데이터베이스 [{0}]에 연결할 수 없습니다.
JDBCStore.loading=데이터베이스 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
JDBCStore.missingDataSourceName=유효한 JNDI 이름이 주어지지 않았습니다.
JDBCStore.removing=데이터베이스 [{1}]에서 세션 [{0}]을(를) 제거합니다.
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties b/java/org/apache/catalina/session/LocalStrings_ru.properties
similarity index 88%
copy from java/org/apache/catalina/loader/LocalStrings_ru.properties
copy to java/org/apache/catalina/session/LocalStrings_ru.properties
index a851ce0..badde70 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webappClassLoader.checkThreadLocalsForLeaks.unknown=Неизвестно
+JDBCStore.connectError=Не возможно подключиться к базе данных [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_de.properties b/java/org/apache/catalina/startup/LocalStrings_de.properties
index f5539fa..2b7339f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_de.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_de.properties
@@ -41,10 +41,8 @@ userConfig.database=Fehler beim Laden der Benutzer Datenbank.
userConfig.error=Fehler beim deployen einer Web-Applikation für den Benutzer [{0}]
userConfig.start=UserConfig: Verarbeite START
-versionLoggerListener.catalina.base=\n\
-\ CATALINA_BASE: {0}
+versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
-versionLoggerListener.os.arch=Architektur: {0}
-versionLoggerListener.serverInfo.server.version=\n\
-\ Server Version: {0}
-versionLoggerListener.vm.vendor=JVM Hersteller: {0}
+versionLoggerListener.os.arch=Architektur: {0}
+versionLoggerListener.serverInfo.server.version=Server Version: {0}
+versionLoggerListener.vm.vendor=JVM Hersteller: {0}
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties b/java/org/apache/catalina/startup/LocalStrings_es.properties
index 486245c..df263b9 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -98,12 +98,21 @@ userConfig.deploy=Despliegue de la aplicación web para el usuario [{0}]
userConfig.deploying=Desplegando aplicaciones web para el usuario
userConfig.error=Error durante el despliegue de la aplicación web para el usario [{0}]
userConfig.start="UserConfig": Procesando "START"
-userConfig.stop="UserConfig": Tratamiento del "STOP"
+userConfig.stop="UserConfig": Tratamiento del "STOP":q
-versionLoggerListener.os.arch=Arquitectura: {0}\n
-versionLoggerListener.os.version=Versión de Systema Operativo: {0}\n
-versionLoggerListener.serverInfo.server.number=Número de versión de servidor: {0}
-versionLoggerListener.serverInfo.server.version=Nombre de la versión del servidor: {0}\n
-versionLoggerListener.vm.vendor=Vededor JVM: {0}
+versionLoggerListener.arg=Command line argument: {0}
+versionLoggerListener.catalina.base=CATALINA_BASE: {0}
+versionLoggerListener.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.env=Environment variable: {0} = {1}
+versionLoggerListener.java.home=Java Home: {0}
+versionLoggerListener.os.arch=Arquitectura: {0}
+versionLoggerListener.os.name=OS Name: {0}
+versionLoggerListener.os.version=Versión de Systema Operativo: {0}
+versionLoggerListener.prop=System property: {0} = {1}
+versionLoggerListener.serverInfo.server.built=Server built: {0}
+versionLoggerListener.serverInfo.server.number=Número de versión de servidor: {0}
+versionLoggerListener.serverInfo.server.version=Nombre de la versión del servidor: {0}
+versionLoggerListener.vm.vendor=Vededor JVM: {0}
+versionLoggerListener.vm.version=JVM Version: {0}
webAnnotationSet.invalidInjection=El método de inyección de anotación no es un recurso válido
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index 6b7760f..b3afed9 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -70,6 +70,7 @@ contextConfig.jspFile.warning=WARNING : Le fichier JSP [{0}] doit commencer par
contextConfig.missingRealm=Aucun royaume (realm) n'a été configuré pour réaliser l'authentification
contextConfig.noAntiLocking=La valeur [{0}] configurée pour java.io.tmpdir ne correspond pas à un répertoire valide, le paramètre antiResourceLocking configuré pour l''application [{1}] sera ignoré
contextConfig.processAnnotationsDir.debug=Balayage du répertoire pour trouver des fichiers de classe avec annotations [{0}]
+contextConfig.processAnnotationsInParallelFailure=L'exécution en parallèle a échoué
contextConfig.processAnnotationsJar.debug=Analyse du fichier jars pour des classes annotées avec [{0}]
contextConfig.processAnnotationsWebDir.debug=Balayage du répertoire d''applications web, pour fichiers de classe avec annotations [{0}]
contextConfig.resourceJarFail=Echec du traitement du JAR trouvé à l''URL [{0}] pour les ressources statiques qui devront être incluses dans le contexte avec le nom [{1}]
@@ -165,18 +166,18 @@ userConfig.start="UserConfig" : Traitement du "START"
userConfig.stop="UserConfig" : Traitement du "STOP"
versionLoggerListener.arg=Argument de la ligne de commande : {0}
-versionLoggerListener.catalina.base=CATALINA_BASE : {0}
-versionLoggerListener.catalina.home=CATALINA_HOME : {0}
-versionLoggerListener.env=Variable d’environnement : {0} = {1}
-versionLoggerListener.java.home=Java Home : {0}
-versionLoggerListener.os.arch=Architecture : {0}
-versionLoggerListener.os.name=Nom de l''OS : {0}
-versionLoggerListener.os.version=Version OS : {0}
-versionLoggerListener.prop=Propriété système : {0} = {1}
-versionLoggerListener.serverInfo.server.built=Serveur compilé : {0}
-versionLoggerListener.serverInfo.server.number=Version du serveur : {0}
-versionLoggerListener.serverInfo.server.version=Nom version serveur : {0}
-versionLoggerListener.vm.vendor=Fournisseur de la JVM : {0}
-versionLoggerListener.vm.version=Version JVM : {0}
+versionLoggerListener.catalina.base=CATALINA_BASE : {0}
+versionLoggerListener.catalina.home=CATALINA_HOME : {0}
+versionLoggerListener.env=Variable d''environnement : {0} = {1}
+versionLoggerListener.java.home=Java Home : {0}
+versionLoggerListener.os.arch=Architecture : {0}
+versionLoggerListener.os.name=Nom de l''OS : {0}
+versionLoggerListener.os.version=Version OS : {0}
+versionLoggerListener.prop=Propriété système : {0} = {1}
+versionLoggerListener.serverInfo.server.built=Serveur compilé : {0}
+versionLoggerListener.serverInfo.server.number=Version du serveur : {0}
+versionLoggerListener.serverInfo.server.version=Nom version serveur : {0}
+versionLoggerListener.vm.vendor=Fournisseur de la JVM : {0}
+versionLoggerListener.vm.version=Version JVM : {0}
webAnnotationSet.invalidInjection=L'annotation d'injection de ressource de la méthode est invalide
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index 4cbd10b..bd68886 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -70,6 +70,7 @@ contextConfig.jspFile.warning=경고: Servlet 2.4에서 JSP 파일 [{0}]은(는)
contextConfig.missingRealm=인증 처리 시 사용할 Realm이 설정되지 않았습니다.
contextConfig.noAntiLocking=java.io.tmpdir 프로퍼티 값 [{0}]이(가) 유효한 디렉토리 경로가 아닙니다. 해당 웹 애플리케이션 [{1}]을(를) 위한 antiResourceLocking 설정은 무시됩니다.
contextConfig.processAnnotationsDir.debug=Annotation들을 가진 클래스 파일들을 찾기 위해 디렉토리 [{0}]을(를) 스캔합니다.
+contextConfig.processAnnotationsInParallelFailure=병렬 처리 실패
contextConfig.processAnnotationsJar.debug=Annotation들, [{0}]을(를) 가진 클래스 파일들을 찾기 위해, JAR 파일을 스캔합니다.
contextConfig.processAnnotationsWebDir.debug=Annotation들인 [{0}]을(를) 가진 클래스 파일들을 찾기 위해, 웹 애플리케이션 디렉토리를 스캔합니다.
contextConfig.resourceJarFail=정적 리소스들이, [{1}](이)라는 이름의 컨텍스트에 포함되게 하기 위하여, URL [{0}]에서 발견된 JAR를 처리하지 못했습니다.
@@ -164,19 +165,19 @@ userConfig.error=사용자 [{0}]을(를) 위한 웹 애플리케이션을 배치
userConfig.start=UserConfig: START 처리 중
userConfig.stop=UserConfig: STOP 처리 중
-versionLoggerListener.arg=명령 행 아규먼트: {0}
-versionLoggerListener.catalina.base=CATALINA_BASE: {0}
-versionLoggerListener.catalina.home=CATALINA_HOME: {0}
-versionLoggerListener.env=환경 변수: {0} = {1}
-versionLoggerListener.java.home=자바 홈: {0}
+versionLoggerListener.arg=명령 행 아규먼트: {0}
+versionLoggerListener.catalina.base=CATALINA_BASE: {0}
+versionLoggerListener.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.env=환경 변수: {0} = {1}
+versionLoggerListener.java.home=자바 홈: {0}
versionLoggerListener.os.arch=아키텍처: {0}
-versionLoggerListener.os.name=운영체제 이름: {0}
-versionLoggerListener.os.version=운영체제 버전: {0}
-versionLoggerListener.prop=시스템 프로퍼티: {0} = {1}
-versionLoggerListener.serverInfo.server.built=Server 빌드 시각: {0}
-versionLoggerListener.serverInfo.server.number=Server 버전 번호: {0}
-versionLoggerListener.serverInfo.server.version=서버 버전 이름: {0}
-versionLoggerListener.vm.vendor=JVM 벤더: {0}
-versionLoggerListener.vm.version=JVM 버전: {0}
+versionLoggerListener.os.name=운영체제 이름: {0}
+versionLoggerListener.os.version=운영체제 버전: {0}
+versionLoggerListener.prop=시스템 프로퍼티: {0} = {1}
+versionLoggerListener.serverInfo.server.built=Server 빌드 시각: {0}
+versionLoggerListener.serverInfo.server.number=Server 버전 번호: {0}
+versionLoggerListener.serverInfo.server.version=서버 버전 이름: {0}
+versionLoggerListener.vm.vendor=JVM 벤더: {0}
+versionLoggerListener.vm.version=JVM 버전: {0}
webAnnotationSet.invalidInjection=유효하지 않은 메소드 리소스 injection annotation입니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ru.properties b/java/org/apache/catalina/startup/LocalStrings_ru.properties
index 7a537a8..2204c43 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ru.properties
@@ -15,8 +15,15 @@
catalina.serverStartFail=Томкат не смог запуститься из-за того что обязательный компонент не смог запуститься
+contextConfig.applicationUrl=Не возможно определить URL для web.xml приложения
contextConfig.defaultPosition=Произошло в строке [{0}] столбце [{1}]
hostConfig.deployDir=Установка веб приложения в папку [{0}]
userConfig.database=Ошибка при загрузке базы данных пользователей
+
+versionLoggerListener.catalina.base=CATALINA_BASE: {0}
+versionLoggerListener.catalina.home=CATALINA_HOME: {0}
+versionLoggerListener.os.arch=Архитектура: {0}
+versionLoggerListener.os.version=Версия ОС: {0}
+versionLoggerListener.vm.version=Версия JVM: {0}
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index a1c4231..41c639a 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -161,17 +161,17 @@ userConfig.error=为用户 [{0}]部署web应用发生错误
userConfig.start=用户配置：处理开始
userConfig.stop=UserConfig:处理停止
-versionLoggerListener.arg=命令行参数：{0}
+versionLoggerListener.arg=命令行参数： {0}
versionLoggerListener.catalina.base=CATALINA_BASE: {0}
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
-versionLoggerListener.env=环境变量：[{0}] = [{1}]
+versionLoggerListener.env=环境变量： {0} = {1}
versionLoggerListener.java.home=Java 环境变量: {0}
versionLoggerListener.os.arch=架构: {0}
versionLoggerListener.os.name=操作系统名称: {0}
versionLoggerListener.os.version=OS.版本: {0}
-versionLoggerListener.prop=系统属性: {0} = {1}
+versionLoggerListener.prop=系统属性: {0} = {1}
versionLoggerListener.serverInfo.server.built=服务器构建: {0}
-versionLoggerListener.serverInfo.server.number=服务器版本号(: {0}
+versionLoggerListener.serverInfo.server.number=服务器版本号: {0}
versionLoggerListener.serverInfo.server.version=Server.服务器版本: {0}
versionLoggerListener.vm.vendor=JVM.供应商: {0}
versionLoggerListener.vm.version=Java虚拟机版本: {0}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
index d791961..340ee06 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ru.properties
@@ -20,3 +20,5 @@ nonBlockingCoordinator.memberAlive.failed=Невозможно проверит
staticMembershipInterceptor.sendShutdown.failed=Не удалось сообщить об отключении.
tcpFailureDetector.still.alive=Проверка завершена. Участник ещё жив [{0}]
+
+tcpPingInterceptor.ping.failed=Не возможно послать TCP пинг.
diff --git a/java/org/apache/catalina/util/LocalStrings_ru.properties b/java/org/apache/catalina/util/LocalStrings_ru.properties
index e969e51..803ec1f 100644
--- a/java/org/apache/catalina/util/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ru.properties
@@ -13,4 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: требуемое расширение [{2}] не найдено.
+
introspection.classLoadFailed=Не возможно закрузить класс [{0}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_ko.properties b/java/org/apache/catalina/valves/LocalStrings_ko.properties
index a989cfe..a0f4a83 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ko.properties
@@ -127,6 +127,8 @@ http.511.reason=네트워크 인증이 필요함
jdbcAccessLogValve.close=데이터베이스를 닫지 못했습니다.
jdbcAccessLogValve.exception=접근 엔트리를 추가하는 중 예외 발생
+persistentValve.filter.failure=필터를 컴파일할 수 없습니다: [{0}]
+
remoteCidrValve.invalid=[{0}]을(를) 위해 유효하지 않은 설정이 제공되었습니다. 상세 정보를 보시려면 이전 메시지들을 확인하십시오.
remoteCidrValve.noRemoteIp=클라이언트가 IP 주소를 가지고 있지 않습니다. 요청은 거절되었습니다.
diff --git a/java/org/apache/catalina/valves/LocalStrings_ru.properties b/java/org/apache/catalina/valves/LocalStrings_ru.properties
index ebffdf1..44a534b 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ru.properties
@@ -15,6 +15,7 @@
http.403.desc=Сервер получил запрос, но отказался его авторизовать.
http.404.reason=Не найдено
+http.415.reason=Неподдерживаемый тип медиа
http.423.reason=Заблокирован
http.426.reason=Требуется обновление
http.429.reason=Слишком много запросов
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties b/java/org/apache/coyote/LocalStrings_ko.properties
index f239153..9ec8f1e 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -53,6 +53,8 @@ asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대
compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, Content-Encoding 헤더를 파싱하지 못했습니다.
+continueResponseTiming.invalid=값 [{0}]은(는) continueResponseTiming을 위한 유효한 설정 옵션이 아닙니다.
+
request.notAsync=오직 비동기 처리 또는 HTTP 업그레이드 처리 시에만, Non-blocking IO로의 전환이 유효합니다.
request.nullReadListener=setReadListener()에 전달된 리스너는 널일 수 없습니다.
request.readListenerSet=Non-blocking 읽기 리스너가 이미 설정되어 있습니다.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ru.properties b/java/org/apache/coyote/http11/LocalStrings_ru.properties
index 856c26b..b49da3f 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ru.properties
@@ -14,3 +14,4 @@
# limitations under the License.
http11processor.request.process=Ошибка при обработке запроса
+http11processor.socket.info=Ошибка при получении информации о сокете
diff --git a/java/org/apache/catalina/util/LocalStrings_ru.properties b/java/org/apache/coyote/http11/filters/LocalStrings_ru.properties
similarity index 78%
copy from java/org/apache/catalina/util/LocalStrings_ru.properties
copy to java/org/apache/coyote/http11/filters/LocalStrings_ru.properties
index e969e51..697705d 100644
--- a/java/org/apache/catalina/util/LocalStrings_ru.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-introspection.classLoadFailed=Не возможно закрузить класс [{0}]
+chunkedInputFilter.invalidCrlfNoCR=Недопустимая последовательность конца строки ( нет возврата каретки до перехода на новую строку)
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index b7f9263..00754e4 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -132,6 +132,7 @@ upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens
upgradeHandler.pruned=Connection [{0}] Elimination du flux terminé [{1}]
upgradeHandler.prunedPriority=La connexion [{0}] a élagué le flux inutilisé [{1}] qui faisait peut-être partie de l''arbre de priorité
upgradeHandler.releaseBacklog=Connection [{0}], Flux [{1}] enlevée de la file d''attente
+upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset a été reçu à cause de [{2}]
upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message [{3}], RST (fermeture du flux)
upgradeHandler.sendPrefaceFail=Connexion [{0}], échec d''envoi de la préface au client
upgradeHandler.socketCloseFailed=Echec de la fermeture du socket
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 48aa092..a2bad0c 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -74,6 +74,7 @@ http2Parser.swallow.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 처
pingManager.roundTripTime=연결 [{0}]: 라운드 트립 시간이 [{1}] 나노초(ns)로 측정되었습니다.
+stream.clientCancel=응답이 완료되기 전에 클라이언트가 스트림을 리셋했습니다.
stream.closed=연결 [{0}], 스트림 [{1}], 한번 닫힌 스트림에 쓰기를 할 수 없습니다.
stream.header.case=연결 [{0}], 스트림 [{1}], HTTP 헤더 이름 [{2}]은(는) 반드시 소문자여야 합니다.
stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더 [connection]은 HTTP/2 요청에서 허용되지 않습니다.
@@ -95,6 +96,7 @@ stream.inputBuffer.reset=스트림이 재설정(reset)되었습니다.
stream.inputBuffer.signal=읽기 쓰레드가 대기하는 동안 inBuffer에 데이터가 추가되었습니다. 해당 쓰레드가 읽기를 계속하도록 시그널을 보냅니다.
stream.notWritable=연결 [{0}], 스트림 [{1}], 이 스트림은 쓰기 가능하지 않습니다.
stream.outputBuffer.flush.debug=연결 [{0}], 스트림 [{1}], 위치 [{2}]의 버퍼를 출력으로 배출합니다. 쓰기 진행 중 여부: [{3}],닫힘 여부: [{4}]
+stream.recycle=연결 [{0}], 스트림 [{1}]이(가) 참조 해제되었습니다.
stream.reprioritisation.debug=연결 [{0}], 스트림 [{1}], 배타성 [{2}], 부모 [{3}], 가중치 [{4}]
stream.reset.fail=연결 [{0}], 스트림 [{1}], 스트림을 재설정(reset)하지 못했습니다.
stream.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 재설정(reset)을 받았습니다.
@@ -130,6 +132,7 @@ upgradeHandler.pruneStart=연결 [{0}]: 이전 스트림들에 대한 가지치
upgradeHandler.pruned=연결 [{0}]이(가) 완료된 스트림 [{1}]을(를) 제거했습니다.
upgradeHandler.prunedPriority=연결 [{0}]이(가) 사용되지 않는 스트림 [{1}]을(를) 제거합니다. 해당 스트림은 priority tree의 일부였을 수 있습니다.
upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로부터 해제되었습니다.
+upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을 닫습니다)
upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
diff --git a/java/org/apache/jasper/resources/LocalStrings_ru.properties b/java/org/apache/jasper/resources/LocalStrings_ru.properties
index 696a4e8..11b5982 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ru.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ru.properties
@@ -13,9 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jasper.error.emptybodycontent.nonempty=Согласно TLD, тег [{0}] должен быть пустым, но он не пустой
+
jsp.error.attribute.deferredmix=Невозможно использовать одновременно ${} и #{} EL выражения в значении атрибута
jsp.error.attribute.noequal=Необходим символ равенства
jsp.error.data.file.processing=Ошибка при обработке файла [{0}]
+jsp.error.el.template.deferred=#{...} не допускается в тексте шаблона
+jsp.error.fallback.invalidUse=jsp:fallback должен быть прямым потомком jsp:plugin
+jsp.error.jspbody.required=Для указания тела тега для [{0}] должно быть использовано jsp: body если используется jsp: attribute.
jsp.error.outputfolder=Не указана выходная папка
jsp.error.parse.xml=XML файл [{0}] содержит ошибки
jsp.error.unknown_attribute_type=Неизвестный тип [{1}] для атрибута [{0}]
diff --git a/java/org/apache/tomcat/util/LocalStrings_ru.properties b/java/org/apache/tomcat/util/LocalStrings_ru.properties
index 535f393..6a6a0f6 100644
--- a/java/org/apache/tomcat/util/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/LocalStrings_ru.properties
@@ -14,3 +14,4 @@
# limitations under the License.
diagnostics.threadDumpTitle=Сброс полной нити
+diagnostics.vmInfoClassCompilation=Компиляция класа
diff --git a/java/org/apache/catalina/loader/LocalStrings_ru.properties b/java/org/apache/tomcat/util/digester/LocalStrings_ru.properties
similarity index 86%
copy from java/org/apache/catalina/loader/LocalStrings_ru.properties
copy to java/org/apache/tomcat/util/digester/LocalStrings_ru.properties
index a851ce0..bd00f9a 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/digester/LocalStrings_ru.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-webappClassLoader.checkThreadLocalsForLeaks.unknown=Неизвестно
+digester.encodingInvalid=Кодировка [{0}] не распознана JRE и будет проигнорирована
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 56d54aa..fd19407 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -163,6 +163,7 @@ sslHostConfigCertificate.mismatch=프로퍼티 [{0}]이(가) [{1}](이)라는
sslImplementation.cnfe=클래스 [{0}]의 SSLImplementation 객체를 생성할 수 없습니다.
sslUtilBase.active=활성화 된 [{0}]은(는) 다음과 같습니다: [{1}]
+sslUtilBase.aliasIgnored=FIPS이 활성화되어 있어, 별칭 [{0}]은(는) 무시됩니다. 키 저장소에 둘 이상의 키가 존재하는 경우, 어떤 키를 사용할지는 키 스토어 구현에 의존하게 됩니다.
sslUtilBase.alias_no_key_entry=별칭 이름 [{0}]을(를) 사용하여 키 엔트리를 식별해낼 수 없습니다.
sslUtilBase.invalidTrustManagerClassName=trustManagerClassName에 의해 제공된 클래스 [{0}]은(는) javax.net.ssl.TrustManager를 구현하지 않았습니다.
sslUtilBase.keystore_load_failed=[{2}](으)로 인하여, 경로 [{1}]에 있고 타입이 [{0}]인 키 저장소를 로드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
index 0af38c2..a27751b 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ru.properties
@@ -14,5 +14,8 @@
# limitations under the License.
endpoint.setAttribute=Установка [{0}] в [{1}]
+endpoint.warn.incorrectConnectionCount=Неверное количество подключений, множественные вызовы socket.close для одного и того же сокета
sslHostConfig.fileNotFound=Сконфигурированный файл [{0}] не существует
+
+sslUtilBase.noneSupported=Ни один из указанных [{0}] не поддерживается движком SSL: ч[{1}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ru.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ru.properties
index a331690..747173e 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_ru.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_ru.properties
@@ -13,4 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+engine.emptyCipherSuite=Пустой набор шифров
engine.noSession=Идентификатор SSL сессии недоступен
+engine.openSSLError=Ошибка OpenSSL: [{0]}] сообщение: [{1}]
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index e0d6325..1bf4f1f 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -68,6 +68,7 @@ wsFrame.notMasked=클라이언트 프레임이 마스크 되어 있지 않습니
wsFrame.oneByteCloseCode=클라이언트가 단일 바이트의 payload를 가진 닫기 프레임을 보냈는데, 이는 유효하지 않습니다.
wsFrame.partialHeaderComplete=웹소켓 프레임을 받았습니다. fin [{0}], rsv [{1}], OpCode [{2}], payload 길이 [{3}]
wsFrame.payloadMsbInvalid=유효하지 않은 웹소켓 프레임이 접수되었습니다 - 64 비트의 payload에, 허용되지 않는 최상위 비트가 설정되었습니다.
+wsFrame.readFailed=비동기 클라이언트의 읽기 실패
wsFrame.sessionClosed=해당 세션이 이미 닫혔기 때문에, 클라이언트 데이터가 처리될 수 없습니다.
wsFrame.suspendRequested=메시지 수신의 일시 정지가 이미 요청되었습니다.
wsFrame.textMessageTooBig=디코드된 텍스트 메시지가 출력 버퍼에 비해 너무 크며, 해당 엔드포인트는 partial 메시지들을 지원하지 않습니다.
@@ -107,10 +108,14 @@ wsSession.messageFailed=웹소켓 연결이 이미 닫혔기 때문에, 완전
wsSession.removeHandlerFailed=핸들러 [{0}]이(가), 이 세션과 함께 등록되지 않았었기 때문에, 제거될 수 없습니다.
wsSession.sendCloseFail=세션 [{0}]을(를) 위해, 원격 엔드포인트로 세션 닫기 메시지를 보내지 못했습니다.
wsSession.timeout=웹소켓 세션 [{0}]이(가) 제한 시간 초과로 만료되었습니다.
+wsSession.timeoutRead=웹소켓 세션 [{0}]이(가) 읽기 유휴 시간 타임아웃으로 만료되었습니다.
+wsSession.timeoutWrite=웹소켓 세션 [{0}]이(가) 쓰기 유휴 시간 타임아웃으로 만료되었습니다.
wsSession.unknownHandler=인식되지 않는 타입 [{1}]을(를) 위한 것이었기에, 해당 메시지 핸들러 [{0}]을(를) 추가할 수 없습니다.
wsSession.unknownHandlerType=메시지 핸들러 [{0}]이(가) 인식되지 않는 타입 [{1}](으)로 wrap 되어 있어, 추가할 수 없습니다.
wsWebSocketContainer.asynchronousSocketChannelFail=서버에 대한 연결을 열 수 없습니다.
+wsWebSocketContainer.connect.entry=타입이 [{0}]인 엔드포인트 인스턴스를 [{1}]에 연결합니다.
+wsWebSocketContainer.connect.write=로컬 주소 [{2}](으)로부터, 시작 위치 [{0}], 최대 길이 [{1}]의 데이터를 버퍼에 씁니다.
wsWebSocketContainer.defaultConfiguratorFail=기본 Configurator를 생성하지 못했습니다.
wsWebSocketContainer.endpointCreateFail=타입이 [{0}]인 로컬 엔드포인트를 생성하지 못했습니다.
wsWebSocketContainer.failedAuthentication=HTTP 응답 코드 [{0}]을(를) 처리하지 못했습니다. 인증 헤더가 서버에 의해 받아들여지지 않았습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d64420..19a4ef5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,19 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ Improvements to French translations. (remm)
+ </add>
+ <add>
+ Improvements to Korean translations. (woonsan)
+ </add>
+ <add>
+ Improvements to Russian translations. Provided by Azat. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.39 (markt)" rtext="2020-10-09">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org