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


The following commit(s) were added to refs/heads/7.0.x by this push:
     new c43b5e3  Back-port i18n improvements
c43b5e3 is described below

commit c43b5e396cfb925c473c3bb403d3309f81fa84ed
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 30 12:48:44 2020 +0000

    Back-port i18n improvements
---
 .../catalina/core/LocalStrings_ru.properties       |  7 ++++++
 .../{util => 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/startup/LocalStrings_de.properties    | 10 ++++-----
 .../catalina/startup/LocalStrings_es.properties    | 21 ++++++++++++-----
 .../catalina/startup/LocalStrings_fr.properties    | 26 +++++++++++-----------
 .../catalina/startup/LocalStrings_ko.properties    | 26 +++++++++++-----------
 .../catalina/startup/LocalStrings_ru.properties    |  7 ++++++
 .../catalina/startup/LocalStrings_zh_CN.properties |  8 +++----
 .../catalina/util/LocalStrings_ru.properties       |  2 ++
 .../catalina/valves/LocalStrings_ru.properties     |  1 +
 .../coyote/http11/LocalStrings_ru.properties       |  1 +
 .../http11/filters}/LocalStrings_ru.properties     |  2 +-
 .../jasper/resources/LocalStrings_ru.properties    |  5 +++++
 .../apache/tomcat/util/LocalStrings_ru.properties  |  1 +
 .../tomcat/websocket/LocalStrings_ko.properties    |  3 +++
 webapps/docs/changelog.xml                         |  5 ++++-
 20 files changed, 86 insertions(+), 45 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties 
b/java/org/apache/catalina/core/LocalStrings_ru.properties
index afe5df1..366f6fc 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -14,8 +14,15 @@
 # limitations under the License.
 
 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/util/LocalStrings_ru.properties 
b/java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
similarity index 88%
copy from java/org/apache/catalina/util/LocalStrings_ru.properties
copy to java/org/apache/catalina/ha/tcp/LocalStrings_ru.properties
index e969e51..08673fa 100644
--- a/java/org/apache/catalina/util/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.
 
-introspection.classLoadFailed=Не возможно закрузить класс [{0}]
+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 8aae2db..bae3976 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -30,6 +30,7 @@ standardLoader.removeRepository=Retrait du réceptacle 
(repository) [{0}]
 standardLoader.starting=Démarrage de ce chargeur (loader)
 standardLoader.stopping=Arrêt de ce chargeur (loader)
 
+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.addTransformer=Ajout d''un transformateur de fichier de 
class [{0}] pour l''application web [{1}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_ko.properties 
b/java/org/apache/catalina/loader/LocalStrings_ko.properties
index fb31f50..7f096bc 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.addTransformer=클래스 파일 Transformer [{0}]을(를) 웹 애플리케이션 [{1}]에 
추가했습니다.
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/startup/LocalStrings_de.properties 
b/java/org/apache/catalina/startup/LocalStrings_de.properties
index ce17250..fc54cd9 100644
--- a/java/org/apache/catalina/startup/LocalStrings_de.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_de.properties
@@ -37,10 +37,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 2de9f09..74582a1 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -127,13 +127,22 @@ 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 f4e53b5..c2435fb 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -139,18 +139,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 5ab33f3..e6ac449 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -137,19 +137,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 e76276e..ba69d4c 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -134,17 +134,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/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_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/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/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/tomcat/websocket/LocalStrings_ko.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 1927e87..2f7c4e5 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -60,6 +60,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.textMessageTooBig=디코드된 텍스트 메시지가 출력 버퍼에 비해 너무 크며, 해당 엔드포인트는 partial 
메시지들을 지원하지 않습니다.
 wsFrame.wrongRsv=클라이언트 프레임이, opCode [{1}]을(를) 포함한 메시지를 위해, reserved 비트들을 
[{0}](으)로 설정했는데, 이는 이 엔드포인트에 의해 지원되지 않습니다.
@@ -95,6 +96,8 @@ 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 되어 
있어, 추가할 수 없습니다.
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dfbeab..0686895 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,7 +158,10 @@
         Improvements to Spanish translations. Provided by Andrewlanecarr.
         (markt)
       </add>
-    </changelog>
+       <add>
+         Improvements to Russian translations. Provided by Azat. (markt)
+       </add>
+     </changelog>
   </subsection>
 </section>
 <section name="Tomcat 7.0.106 (violetagg)" rtext="released 2020-09-20">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to