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/05 19:44:31 UTC
[tomcat] branch 8.5.x updated (c1087c8 -> 602fbe9)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from c1087c8 Allow for path length in cached resource size
new 3656681 http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
new 45e0275 Alphabetical order
new 0fb435b Correct replacement, fix format
new 806d06a Improvements to Chinese translations. Provided by leeyazhou. (markt)
new 3b7b81e Improvements to French translations (remm)
new 084f3b0 Improvements to Korean translations. (woonsan)
new 90d1710 Improvements to Spanish translations. Provided by Andrewlanecarr
new 602fbe9 Back-port additional translations from 9.0.x
The 8 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:
.../apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/core/LocalStrings_ru.properties | 1 -
java/org/apache/catalina/manager/LocalStrings_es.properties | 1 +
.../apache/catalina/manager/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings.properties | 2 +-
java/org/apache/catalina/session/LocalStrings_ko.properties | 1 +
.../apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties | 1 +
.../apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/tribes/group/LocalStrings_es.properties | 1 +
java/org/apache/catalina/valves/LocalStrings.properties | 4 ++--
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
.../apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
.../catalina/valves/rewrite/LocalStrings_ko.properties | 2 ++
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ++++---
java/org/apache/coyote/http2/LocalStrings.properties | 8 ++++----
java/org/apache/coyote/http2/LocalStrings_fr.properties | 3 +++
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++
.../apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
.../apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++++++
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 ++
.../apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4 ++++
webapps/docs/changelog.xml | 13 +++++++++++++
34 files changed, 72 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/08: Improvements to Chinese translations. Provided by
leeyazhou. (markt)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 806d06aa4598bc367059e61c8157d61e85035c41
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:41:57 2020 +0100
Improvements to Chinese translations. Provided by leeyazhou. (markt)
---
java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4 ++++
webapps/docs/changelog.xml | 3 +++
11 files changed, 21 insertions(+)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 42fcf30..c368e6e 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -82,6 +82,7 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作
request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
request.illegalWrap=请求包装器必须包装从getRequest（）获得的请求
request.notAsync=如果当前请求不在异步模式下，则调用此方法是非法的（即isAsyncStarted（）返回false）
+request.session.failed=由于[{1}]，加载会话[{0}]失败
requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 0d1664d..6c177ce 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -146,6 +146,7 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
managerServlet.saved=OK - 服务器配置已保存
managerServlet.savedContext=OK - 上下文[{0}]配置已保存
+managerServlet.savedContextFail=失败 - 上下文[{0}]配置保存失败
managerServlet.serverInfo=OK - 服务器信息\n\
Tomcat版本: [{0}]\n\
操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 2354b3f..7a1cc2c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}]
fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。
fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}]
fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}]
+fileStore.invalid=无效的持久化文件[{0}]，会话ID为[{1}]
fileStore.loading=正在从文件[{1}]加载会话[{0}]
fileStore.removing=正在删除文件{1}处的会话{0}]
fileStore.saving=保存会话[{0}]到文件[{1}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index c1eb7fd..f8a6b9f 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=无法处理Jar[{0}]的注解
contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须以‘/’开头
contextConfig.missingRealm=对应的认证领域未配置
+contextConfig.noAntiLocking=配置 java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class 文件
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index e5c1be8..163cba1 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -125,6 +125,8 @@ http.511.reason=需要网络身份验证
jdbcAccessLogValve.close=无法关闭数据库。
jdbcAccessLogValve.exception=执行插入访问项时发生异常
+persistentValve.filter.failure=无法编译filter=[{0}]
+
remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息，请参阅以前的消息
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 8cbffeb..f5c064a 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -49,6 +49,8 @@ asyncStateMachine.invalidAsyncState=调用[{0}]对于具有异步状态[{1}]的
compressionConfig.ContentEncodingParseFail=检查压缩是否已经在使用时，解析Content-Encoding头失败
+continueResponseTiming.invalid=对于continueResponseTiming，值[{0}]不是有效的配置项
+
request.notAsync=只有在异步处理或HTTP升级处理中切换到非阻塞IO才有效
request.nullReadListener=传递给setReadListener（）的侦听器不能为空
request.readListenerSet=已设置非阻塞读取侦听器
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index aa192dc..ec19be9 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -73,12 +73,14 @@ 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=HTTP/2请求中不允许连接{0}、流{1}、HTTP头[连接]
stream.header.contentLength=连接{0}，流{1}，内容长度头值{2}与接收的数据大小{3}不一致
stream.header.debug=连接[{0}]，流[{1}]，HTTP标头[{2}]，值[{3}]
stream.header.duplicate=连接[{0}]，流[{1}]，收到多个[{3}]头
+stream.header.empty=连接[{0}]，流[{1}]，无效的空头名称
stream.header.invalid=连接[{0}]，流[{1}]，头[{2}]包含无效值[{3}]
stream.header.noPath=连接[{0}]，流[{1}]，[：path]伪标头为空
stream.header.required=连接 [{0}], 流 [{1}], 缺少一个或多个必要的头文件
@@ -93,6 +95,7 @@ stream.inputBuffer.reset=流.重置
stream.inputBuffer.signal=读线程在等待时，数据被添加到inBuffer中。 发信号通知该线程继续
stream.notWritable=连接{0}，流{1}，此流不可写
stream.outputBuffer.flush.debug=连接{0}，流{1}，用缓冲区在位置{2}刷新输出，writeInProgress[{3}]并关闭了[{4}]
+stream.recycle=连接[{0}]，流[{1}]已回收
stream.reprioritisation.debug=连接[{0}]，流[{1}]，独占[{2}]，父[{3}]，权重[{4}]
stream.reset.fail=连接[{0}]，流[{1}]，重置流失败
stream.reset.receive=连接{0}，流{1}，由于{2}而收到重置
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index af4c9ae..36b8630 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -20,6 +20,8 @@ b2cConverter.unknownEncoding=不支持字符编码[{0}]
byteBufferUtils.cleaner=无法使用直接ByteBuffer清洁剂，可能会发生内存泄漏
+encodedSolidusHandling.invalid=值[{0}]未识别
+
hexUtils.fromHex.nonHex=输入只能由十六进制数字组成
hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index eddf282..00a8524 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -144,6 +144,7 @@ sslHostConfigCertificate.mismatch=属性[{0}]是在名为[{1}]的SSLHostConfigCe
sslImplementation.cnfe=无法为类 [{0}] 创建SSLImplementation
sslUtilBase.active=活跃的[{0}]是：[{1}]
+sslUtilBase.aliasIgnored=FIPS已启用所以别名[{0}]将被忽略。如果key存储中的key大于一个，使用的key将取决于key存储的实现
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/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index cb77244..06aa5f6 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -67,6 +67,7 @@ wsFrame.noContinuation=当需要延续帧时启动了新消息。
wsFrame.notMasked=客户端帧未被屏蔽，但必须屏蔽所有客户端帧
wsFrame.oneByteCloseCode=客户端发送了一个包含无效单字节有效负载的关闭帧。
wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode [{2}], payload 长度 [{3}]
+wsFrame.readFailed=异步客户端读取失败
wsFrame.sessionClosed=无法处理客户端数据，因为会话已被关闭
wsFrame.suspendRequested=已请求暂停接收邮件。
wsFrame.textMessageTooBig=解码的文本消息对于输出缓冲区太大，终结点不支持部分消息
@@ -106,6 +107,8 @@ wsSession.messageFailed=无法写入完整消息，因为WebSocket连接已关
wsSession.removeHandlerFailed=无法删除处理程序[{0}]，因为它未在此会话中注册
wsSession.sendCloseFail=给远程端点发送关闭消息失败，session：[{0}]
wsSession.timeout=WebSocket会话[{0}]超时已过期
+wsSession.timeoutRead=WebSocket会话[{0}]读取空闲超时过期
+wsSession.timeoutWrite=WebSocket会话[{0}]写入空闲超时过期
wsSession.unknownHandler=无法添加消息处理程序[{0}]，因为它是针对无法识别的类型[{1}]
wsSession.unknownHandlerType=无法添加消息处理程序[{0}]，因为它被包装为无法识别的类型[{1}]。
@@ -126,6 +129,7 @@ wsWebSocketContainer.pathNoHost=URI中未指定主机
wsWebSocketContainer.pathWrongScheme=不支持方案[{0}]。支持的方案是ws和wss
wsWebSocketContainer.proxyConnectFail=失败连接到已配置的代理 [{0}]。HTTP 响应码是 [{1}]
wsWebSocketContainer.redirectThreshold=循环位置头[{0}]检测到/达到最大重定向数[{1}]的最大值[{2}]
+wsWebSocketContainer.responseFail=HTTP升级WebSocket失败，但是部分数据已被接收：状态码：[{0}],HTTP请求头[{1}]
wsWebSocketContainer.sessionCloseFail=ID 为 [{0}] 的session 没有彻底关闭
wsWebSocketContainer.shutdown=web应用程序正在停止
wsWebSocketContainer.sslEngineFail=无法创建SSLEngine以支持SSL/TLS连接
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3ea042d..939b5a6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,9 @@
href="https://bugs.openjdk.java.net/browse/JDK-8234808">JDK-8234808</a>.
(markt)
</fix>
+ <add>
+ Improvements to Chinese translations. Provided by leeyazhou. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/08: Improvements to French translations (remm)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3b7b81efe0cb703c637580b2c185eb7884735d4d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:42:52 2020 +0100
Improvements to French translations (remm)
---
java/org/apache/catalina/startup/LocalStrings_fr.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/LocalStrings_fr.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 7 +++++++
7 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index 6a41da1..ca98d92 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=Impossible de traiter les annotations du JAR [{0}]
contextConfig.jspFile.error=Le fichier JSP [{0}] doit commencer par un ''/''
contextConfig.jspFile.warning=WARNING : Le fichier JSP [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
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.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}]
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index 5a8d47b..9f9024a 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -125,6 +125,8 @@ http.511.reason=L’authentification du réseau est nécessaire
jdbcAccessLogValve.close=Echec de fermeture de la base de donnée
jdbcAccessLogValve.exception=Exception en insérant l'entrée de l'accès
+persistentValve.filter.failure=Impossible de compiler le filtre=[{0}]
+
remoteCidrValve.invalid=La configuration fournie pour [{0}] est invalide, voir les précédents messages pour plus de détails
remoteCidrValve.noRemoteIp=Le client n'a pas d'adresse IP, requête interdite
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties b/java/org/apache/coyote/LocalStrings_fr.properties
index a7e5a12..0d6f30e 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -49,6 +49,8 @@ asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour une
compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête Content-Encoding en vérifiant si la compression était déjà utilisée
+continueResponseTiming.invalid=La valeur [{0}] n''est pas valide pour continueResponseTiming
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non bloquantes que lors de traitements asynchrones ou après mise à niveau depuis HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été défini
diff --git a/java/org/apache/coyote/ajp/LocalStrings_fr.properties b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
index c741323..adb09dd 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_fr.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=Un en-tête de message de taille [{0}] a été reçu
ajpprocessor.readtimeout=Timeout lors de la lecture de données sur le socket
ajpprocessor.request.prepare=Erreur lors de la préparation de la requête
ajpprocessor.request.process=Erreur de traitement de la requête
+ajpprocessor.unknownAttribute=La requête est rejetée à cause de l''attribut de requête [{0}] inconnu reçu du reverse proxy
ajpprotocol.noSSL=SSL n''est pas supporté par AJP, la configuration de l''hôte SSL pour [{0}] a été ignorée
ajpprotocol.noSecret=Le connecteur AJP est configuré avec secretRequired="true" mais l'attribut secret est soit null soit "", cette combinaison n'est pas valide
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 1423779..b2df537 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -73,12 +73,14 @@ http2Parser.swallow.debug=Connection [{0}], Flux [{1}], Avalé [{2}] octets
pingManager.roundTripTime=Connection [{0}] Le temps d''aller retour est de [{1}]ns
+stream.clientCancel=Le client a réinitialisé la stream avant que la réponse ne soit complète
stream.closed=Connection [{0}], Flux [{1}], Impossible d''écrire sur un flux après sa fermeture
stream.header.case=Connection [{0}], Flux [{1}], Le nom d''en-tête HTTP [{2}] doit être en miniscules
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP [connection] n''est pas autorisé dans une requête HTTP/2
stream.header.contentLength=Connection [{0}], Flux [{1}], La valeur de l''en-tête content-length [{2}] ne correspond pas à la taille des données reçue [{3}]
stream.header.debug=Connection [{0}], Flux [{1}], en-tête HTTP [{2}], valeur [{3}]
stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes [{3}]
+stream.header.empty=Connection [{0}], Flux [{1}], Le nom d''en-tête nul est invalide
stream.header.invalid=Connection [{0}], Flux [{1}], L''en-tête[{2}] contenait la valeur invalide [{3}]
stream.header.noPath=Connection [{0}], flux [{1}], Le [:path] pseudo en-tête est vide
stream.header.required=Connection [{0}], Flux [{1}], Un ou plusieurs en-têtes nécessaires sont manquants
@@ -93,6 +95,7 @@ stream.inputBuffer.reset=Flux réinitialisé
stream.inputBuffer.signal=Des données ont été ajoutées dans inBuffer alors que le thread de lecture attend, cela lui sera signalé
stream.notWritable=Connection [{0}], Flux [{1}], Impossible d''écrire sur ce flux
stream.outputBuffer.flush.debug=Connection [{0}], Flux [{1}], envoi des données mises en tampon depuis la position [{2}], writeInProgress [{3}] et closed [{4}]
+stream.recycle=Connection [{0}], Stream [{1}] a été recyclée
stream.reprioritisation.debug=Connection [{0}], Flux [{1}], Exclusive [{2}], Parent [{3}], Poids [{4}]
stream.reset.fail=Connection [{0}], Flux [{1}], Echec de réinitialisation du flux
stream.reset.receive=Connection [{0}], Flux [{1}], Réinitialisation reçue à cause de [{2}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 7c7a5b5..bc9a15a 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -145,6 +145,7 @@ sslHostConfigCertificate.mismatch=La propriété [{0}] a été définie sur le S
sslImplementation.cnfe=Impossible de créer une SSLImplementation avec la class [{0}]
sslUtilBase.active=Les [{0}] qui sont actifs sont : [{1}]
+sslUtilBase.aliasIgnored=Le mode FIPS est activé donc le nom d''alias [{0}] sera ignoré, s''il il y a plus d''une clé dans la keystore, la clé utilisée dépendra de son implémentation
sslUtilBase.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée de clé
sslUtilBase.invalidTrustManagerClassName=Le trustManagerClassName fourni [{0}] n''implémente pas javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Impossible de changer la base de clés de type [{0}] avec le chemin [{1}] à cause de [{2}]
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index e3a6586..0a8d5e8 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -67,6 +67,8 @@ wsFrame.noContinuation=Un nouveau message a été démarré quand une trame de c
wsFrame.notMasked=La trame du client n'a pas de masque alors que toutes les trames des clients doivent en avoir un
wsFrame.oneByteCloseCode=Le client a envoyé une trame de fermeture avec un octet de données ce qui est invalide
wsFrame.partialHeaderComplete=Une trame Websocket a été recue, fin [{0}], rsv [{1}], opCode [{2}], taille de données [{3}]
+wsFrame.payloadMsbInvalid=Une trame WebSocket invalide a été reçue, le bit le plus significatif d'un bloc de 64 bits ne peut être mis
+wsFrame.readFailed=La lecture asynchrone du client a échoué
wsFrame.sessionClosed=Les données du client ne peuvent pas être traitées car la session a déjà été fermée
wsFrame.suspendRequested=La suspension de la réception des messages a déjà été demandée
wsFrame.textMessageTooBig=Le message texte décodé était trop grand pour le tampon de sortie et la terminaison ne supporte pas les messages partiels
@@ -106,10 +108,14 @@ wsSession.messageFailed=Impossible d'écrire le message WebSocket complet car la
wsSession.removeHandlerFailed=Impossible d''enlever le gestionnaire [{0}] car il n''était pas enregistré dans la session
wsSession.sendCloseFail=Impossible d''envoyer le message de fermeture pour la session [{0}] à la terminaison distante
wsSession.timeout=Le délai d''attente maximum de la session WebSocket [{0}] a été dépassé
+wsSession.timeoutRead=Le délai d''inactivité en lecture de la session WebSocket [{0}] a expiré
+wsSession.timeoutWrite=Le délai d''inactivité en écriture de la session WebSocket [{0}] a expiré
wsSession.unknownHandler=Impossible d''ajouter le gestionnaire de messages [{0}] pour le type non reconnu [{1}]
wsSession.unknownHandlerType=Incapable d''ajouter le gestionnaire de messages [{0}] puisqu''il est enveloppé (wrapped) comme le type non reconnu [{1}]
wsWebSocketContainer.asynchronousSocketChannelFail=Impossible d'ouvrir une connection vers le serveur
+wsWebSocketContainer.connect.entry=Connection à l''instance d''endpoint de type [{0}] à [{1}]
+wsWebSocketContainer.connect.write=Ecriture de la requête d''upgrade HTTP depuis le tampon à partir de [{0}] avec une limite de [{1}] depuis l''adresse locale [{2}]
wsWebSocketContainer.defaultConfiguratorFail=Impossible de créer le configurateur par défaut
wsWebSocketContainer.endpointCreateFail=Echec de création d''un point d''entrée local de type [{0}]
wsWebSocketContainer.failedAuthentication=Echec du traitement du code de réponse HTTP [{0}], l''en-tête d''authentification n''a pas été accepté par le serveur
@@ -126,6 +132,7 @@ wsWebSocketContainer.pathNoHost=Aucun hôte n'est spécifié dans l'URI
wsWebSocketContainer.pathWrongScheme=Le schéma [{0}] n''est pas supporté, seuls sont supportés ws et wss
wsWebSocketContainer.proxyConnectFail=Impossible de se connecter au Proxy [{0}] configuré, le code HTTP de la réponse est [{0}]
wsWebSocketContainer.redirectThreshold=L''en-tête Location [{0}] est cyclique, le nombre de redirections [{1}] a été atteint sur le maximum [{2}]
+wsWebSocketContainer.responseFail=L''upgrade de HTTP vers WebSocket a échouée mais des données partielles peuvent avoir été reçues: Status Code [{0}], En têtes HTTP [{1}]
wsWebSocketContainer.sessionCloseFail=La session avec ID [{0}] n''a pas été fermée proprement.
wsWebSocketContainer.shutdown=L'application web s'arrête
wsWebSocketContainer.sslEngineFail=Impossible de créer un SSLEngine pour supporter les connections TLS
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/08: Alphabetical order
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 45e0275a90f9e5a6196b9416e17bfe8e637dc66a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:40:15 2020 +0100
Alphabetical order
---
java/org/apache/catalina/session/LocalStrings.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings.properties | 4 ++--
java/org/apache/tomcat/util/net/LocalStrings.properties | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index dae4f68..7676cf4 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -20,12 +20,12 @@ JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The da
JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
JDBCStore.close=Exception closing database connection [{0}]
JDBCStore.commitSQLException=SQLException committing connection before closing
+JDBCStore.connectError=Cannot connect to database [{0}]
JDBCStore.loading=Loading Session [{0}] from database [{1}]
JDBCStore.missingDataSourceName=No valid JNDI name was given.
JDBCStore.removing=Removing Session [{0}] at database [{1}]
JDBCStore.saving=Saving Session [{0}] to database [{1}]
JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
-JDBCStore.connectError=Cannot connect to database [{0}]
fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 32fe151..89fcb46 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -127,6 +127,8 @@ http.511.reason=Network Authentication Required
jdbcAccessLogValve.close=Failed to close database
jdbcAccessLogValve.exception=Exception performing insert access entry
+persistentValve.filter.failure=Unable to compile filter=[{0}]
+
remoteCidrValve.invalid=Invalid configuration provided for [{0}]. See previous messages for details.
remoteCidrValve.noRemoteIp=Client does not have an IP address. Request denied.
@@ -143,5 +145,3 @@ sslValve.invalidProvider=The SSL provider specified on the connector associated
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread [{0}] (id=[{3}]) was previously reported to be stuck but has completed. It was active for approximately [{1}] milliseconds.{2,choice,0#|0< There is/are still [{2}] thread(s) that are monitored by this Valve and may be stuck.}
stuckThreadDetectionValve.notifyStuckThreadDetected=Thread [{0}] (id=[{6}]) has been active for [{1}] milliseconds (since [{2}]) to serve the same request for [{4}] and may be stuck (configured threshold for this StuckThreadDetectionValve is [{5}] seconds). There is/are [{3}] thread(s) in total that are monitored by this Valve and may be stuck.
stuckThreadDetectionValve.notifyStuckThreadInterrupted=Thread [{0}] (id=[{5}]) has been interrupted because it was active for [{1}] milliseconds (since [{2}]) to serve the same request for [{3}] and was probably stuck (configured interruption threshold for this StuckThreadDetectionValve is [{4}] seconds).
-
-persistentValve.filter.failure=Unable to compile filter=[{0}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 4cfb76c..b6d7861 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -146,8 +146,8 @@ sslHostConfigCertificate.mismatch=The property [{0}] was set on the SSLHostConfi
sslImplementation.cnfe=Unable to create SSLImplementation for class [{0}]
sslUtilBase.active=The [{0}] that are active are : [{1}]
-sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
sslUtilBase.aliasIgnored=FIPS enabled so alias name [{0}] will be ignored. If there is more than one key in the key store, the key used will depend on the key store implementation
+sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
sslUtilBase.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Failed to load keystore type [{0}] with path [{1}] due to [{2}]
sslUtilBase.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 08/08: Back-port additional translations from 9.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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 602fbe93c54259d92b52fdb228223bde55b30f98
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:44:07 2020 +0100
Back-port additional translations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_ru.properties | 1 -
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_ru.properties b/java/org/apache/catalina/core/LocalStrings_ru.properties
index 6759ce9..2bd49cb 100644
--- a/java/org/apache/catalina/core/LocalStrings_ru.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ru.properties
@@ -25,7 +25,6 @@ standardWrapper.destroyInstance=InstanceManager.destroy() для сервлет
standardWrapper.initException=Servlet.init() для сервлета [{0}] выбросил исключение
standardWrapper.instantiate=Ошибка создания экземпляра класса сервлета [{0}]
standardWrapper.isUnavailable=Сервлет [{0}] временно недоступен
-standardWrapper.jspMonitorError=Ошибка регистрации JSP-монитора Mbean [{0}]
standardWrapper.notChild=Контейнер может не иметь дочерних контейнеров
standardWrapper.notClass=Для сервлета [{0}] не указан специальный класс
standardWrapper.notContext=Родительский контейнер обертки должен быть контекстом
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index d6e95af..6a114c7 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -79,6 +79,7 @@ stream.header.connection=コネクション [{0}]、ストリーム [{1}]、HTTP
stream.header.contentLength=コネクション [{0}]、ストリーム [{1}]、content length ヘッダーの値 [{2}] と受信したデータ長 [{3}] は一致しません。
stream.header.debug=コネクション [{0}]、ストリーム [{1}]、HTTP ヘッダー [{2}]、値は [{3}]
stream.header.duplicate=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{3}] を複数受信しました。
+stream.header.empty=接続 [{0}]、ストリーム [{1}]、無効な空ヘッダ名です
stream.header.invalid=コネクション [{0}]、ストリーム [{1}]、ヘッダー [{2}] に不正な値 [{3}] が含まれています。
stream.header.noPath=コネクション [{0}]、ストリーム [{1}]、疑似ヘッダー [:path] が空です。
stream.header.required=コネクション [{0}]、ストリーム [{1}]、１つ以上の必須ヘッダがありません。
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/08: http2: Add 'EndOfStream' to the logs for
writeHeaders and writeBody
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3656681ad5ee2d72a9a935dcffe1238ec4419e75
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Sep 24 13:46:31 2020 +0300
http2: Add 'EndOfStream' to the logs for writeHeaders and writeBody
Call streams.size() just once.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 7 ++++---
java/org/apache/coyote/http2/LocalStrings.properties | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 2a2fee5..d5d11e5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -662,7 +662,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
if (log.isDebugEnabled()) {
if (pushedStreamId == 0) {
log.debug(sm.getString("upgradeHandler.writeHeaders", connectionId,
- stream.getIdAsString()));
+ stream.getIdAsString(), Boolean.valueOf(endOfStream)));
} else {
log.debug(sm.getString("upgradeHandler.writePushHeaders", connectionId,
stream.getIdAsString(), Integer.valueOf(pushedStreamId),
@@ -1171,9 +1171,10 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
// maximum number of concurrent streams.
long max = localSettings.getMaxConcurrentStreams();
+ final int size = streams.size();
if (log.isDebugEnabled()) {
log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
- Long.toString(max), Integer.toString(streams.size())));
+ Long.toString(max), Integer.toString(size)));
}
// Only need ~+10% for streams that are in the priority tree,
@@ -1187,7 +1188,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
max = Integer.MAX_VALUE;
}
- int toClose = streams.size() - (int) max;
+ int toClose = size - (int) max;
if (toClose < 1) {
return;
}
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 9c34e93..2b9c586 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -148,8 +148,8 @@ upgradeHandler.upgradeDispatch.entry=Entry, Connection [{0}], SocketStatus [{1}]
upgradeHandler.upgradeDispatch.exit=Exit, Connection [{0}], SocketState [{1}]
upgradeHandler.windowSizeReservationInterrupted=Connection [{0}], Stream [{1}], reservation for [{2}] bytes
upgradeHandler.windowSizeTooBig=Connection [{0}], Stream [{1}], Window size too big
-upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}]
-upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}]
+upgradeHandler.writeBody=Connection [{0}], Stream [{1}], Data length [{2}], EndOfStream [{3}]
+upgradeHandler.writeHeaders=Connection [{0}], Stream [{1}], Writing the headers, EndOfStream [{2}]
upgradeHandler.writePushHeaders=Connection [{0}], Stream [{1}], Pushed stream [{2}], EndOfStream [{3}]
windowAllocationManager.dispatched=Connection [{0}], Stream [{1}], Dispatched
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/08: Improvements to Korean translations. (woonsan)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 084f3b0241dde337cf106702a4f467ef67d7f9c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:43:20 2020 +0100
Improvements to Korean translations. (woonsan)
---
java/org/apache/catalina/session/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_ko.properties | 1 +
java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 6 ++++++
7 files changed, 14 insertions(+)
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 42ed1fe..d12d230 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=JNDI DataSource [{0}]을(를) 열 수 없습니다.
fileStore.createFailed=세션 데이터 저장소를 위한 디렉토리[{0}]을(를) 생성할 수 없습니다.
fileStore.deleteFailed=파일 [{0}]을(를) 삭제할 수 없습니다. 이는 세션 저장소 위치의 생성을 방해하고 있습니다.
fileStore.deleteSessionFailed=더 이상 필요하지 않은 파일 [{0}]을(를) 삭제할 수 없습니다.
+fileStore.invalid=세션 ID [{1}]을(를) 위한 세션 저장소 파일 [{0}]이(가) 유효하지 않습니다.
fileStore.loading=파일 [{1}](으)로부터 세션 [{0}]을(를) 로드합니다.
fileStore.removing=파일 [{1}]에 저장된 세션 [{0}]을(를) 제거합니다.
fileStore.saving=세션 [{0}]을(를) 파일 [{1}]에 저장합니다.
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index ea7031f..9f599ee 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -54,6 +54,7 @@ contextConfig.jarFile=Annotation들을 위해 Jar [{0}]을(를) 처리할 수
contextConfig.jspFile.error=JSP 파일 [{0}]은(는) 반드시 ''/''로 시작해야 합니다.
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.processAnnotationsJar.debug=Annotation들, [{0}]을(를) 가진 클래스 파일들을 찾기 위해, JAR 파일을 스캔합니다.
contextConfig.processAnnotationsWebDir.debug=Annotation들인 [{0}]을(를) 가진 클래스 파일들을 찾기 위해, 웹 애플리케이션 디렉토리를 스캔합니다.
diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
index 2161de4..7826877 100644
--- a/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_ko.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+quotedStringTokenizer.tokenizeError=토큰으로 파싱하는 중 오류 발생 (문자열: [{0}], 위치: [{1}], 현재 모드: [{2}])
+
rewriteValve.closeError=설정 리소스의 스트림을 닫는 중 오류 발생
rewriteValve.invalidFlags=[{0}] 내에 유효하지 않은 플래그입니다 (플래그들: [{1}]).
rewriteValve.invalidLine=유효하지 않은 행 [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_ko.properties b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
index b8927d8..4cfc255 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_ko.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=길이가 [{0}]인 헤더 메시지를 받았지만,
ajpprocessor.readtimeout=소켓으로부터 데이터를 읽으려는 시도가 제한 시간 초과되었습니다.
ajpprocessor.request.prepare=요청을 준비하는 중 오류 발생
ajpprocessor.request.process=요청 처리 중 오류 발생
+ajpprocessor.unknownAttribute=리버스 프록시 서버로부터 알 수 없는 요청 속성 [{0}]이(가) 접수되어 요청 처리를 거부합니다.
ajpprotocol.noSSL=AJP와 함께 SSL은 지원되지 않습니다. [{0}]을(를) 위한 SSL 호스트 설정은 무시되었습니다.
ajpprotocol.noSecret=AJP 연결자는 secretRequired="true"로 구성되었으나 보안 속성이 널 또는 ""입니다. 이 조합은 유효하지 않습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index c78ed8f..0db0dad 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -79,6 +79,7 @@ stream.header.connection=연결 [{0}], 스트림 [{1}], HTTP 헤더 [connection]
stream.header.contentLength=연결 [{0}], 스트림 [{1}], 해당 Content-Length 헤더 값 [{2}]은(는) 수신된 데이터의 크기 [{3}]와(과) 일치하지 않습니다.
stream.header.debug=연결 [{0}], 스트림 [{1}], HTTP 헤더: [{2}], 값: [{3}]
stream.header.duplicate=연결 [{0}], 스트림 [{1}], 여러 개의 [{3}] 헤더들을 받았습니다.
+stream.header.empty=연결 [{0}], 스트림 [{1}], 헤더 이름이 빈 문자열이어서 유효하지 않습니다.
stream.header.invalid=연결 [{0}], 스트림 [{1}], 헤더 [{2}]이(가) 유효하지 않은 값을 포함했습니다: [{3}]
stream.header.noPath=연결 [{0}], 스트림 [{1}], [:path] 가상 헤더가 비어 있었습니다.
stream.header.required=연결 [{0}], 스트림 [{1}], 하나 이상의 필수 헤더들이 없습니다.
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 0ddbe24..e0d6325 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -67,6 +67,7 @@ wsFrame.noContinuation=Continuation 프레임이 요구될 때에, 새로운 메
wsFrame.notMasked=클라이언트 프레임이 마스크 되어 있지 않습니다. 모든 클라이언트 프레임들은 반드시 마스크 되어야 합니다.
wsFrame.oneByteCloseCode=클라이언트가 단일 바이트의 payload를 가진 닫기 프레임을 보냈는데, 이는 유효하지 않습니다.
wsFrame.partialHeaderComplete=웹소켓 프레임을 받았습니다. fin [{0}], rsv [{1}], OpCode [{2}], payload 길이 [{3}]
+wsFrame.payloadMsbInvalid=유효하지 않은 웹소켓 프레임이 접수되었습니다 - 64 비트의 payload에, 허용되지 않는 최상위 비트가 설정되었습니다.
wsFrame.sessionClosed=해당 세션이 이미 닫혔기 때문에, 클라이언트 데이터가 처리될 수 없습니다.
wsFrame.suspendRequested=메시지 수신의 일시 정지가 이미 요청되었습니다.
wsFrame.textMessageTooBig=디코드된 텍스트 메시지가 출력 버퍼에 비해 너무 크며, 해당 엔드포인트는 partial 메시지들을 지원하지 않습니다.
@@ -126,6 +127,7 @@ wsWebSocketContainer.pathNoHost=URI 내에 호스트가 지정되지 않았습
wsWebSocketContainer.pathWrongScheme=스킴 [{0}]은(는) 지원되지 않습니다. 지원되는 스킴들은 ws와 wss입니다.
wsWebSocketContainer.proxyConnectFail=설정된 프록시 [{0}](으)로 연결하지 못했습니다. HTTP 응답 코드는 [{1}]이었습니다.
wsWebSocketContainer.redirectThreshold=순환 Location 헤더 [{0}]이(가) 탐지되었고, 최대 redirect 회수에 도달했습니다. 최대 [{2}]회 중 [{1}]회.
+wsWebSocketContainer.responseFail=웹소켓으로의 HTTP 업그레이드가 실패했습니만, 일부 데이터가 접수되었을 수 있습니다: 상태 코드 [{0}], HTTP 헤더들 [{1}]
wsWebSocketContainer.sessionCloseFail=ID가 [{0}]인 세션이 깨끗하게 닫히지 않았습니다.
wsWebSocketContainer.shutdown=웹 애플리케이션이 중지되고 있습니다.
wsWebSocketContainer.sslEngineFail=SSL/TLS 연결들을 지원하는 SSLEngine을 생성할 수 없습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 939b5a6..8370d7d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -181,6 +181,12 @@
<add>
Improvements to Chinese translations. Provided by leeyazhou. (markt)
</add>
+ <add>
+ Improvements to French translations. (remm)
+ </add>
+ <add>
+ Improvements to Korean translations. (woonsan)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 07/08: Improvements to Spanish translations. Provided by
Andrewlanecarr
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 90d1710deffd2ddc4a7f35f7f32f4a3cf810a55b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:43:47 2020 +0100
Improvements to Spanish translations. Provided by Andrewlanecarr
---
java/org/apache/catalina/manager/LocalStrings_es.properties | 1 +
java/org/apache/catalina/tribes/group/LocalStrings_es.properties | 1 +
java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties | 1 +
webapps/docs/changelog.xml | 4 ++++
4 files changed, 7 insertions(+)
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 743e99c..298767f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -62,6 +62,7 @@ htmlManagerServlet.manager=Gestor
htmlManagerServlet.messageLabel=Mensaje:
htmlManagerServlet.noManager=-
htmlManagerServlet.noVersion=Ninguno especificado
+htmlManagerServlet.osFreePageFile=Archivo de página gratis:
htmlManagerServlet.osTotalPageFile=Tamaño total de archivo de página:
htmlManagerServlet.serverHostname=NombreDeMáquina
htmlManagerServlet.serverIPAddress=Dirección IP
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
index 0a03ba0..7aae463 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_es.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+channelCoordinator.alreadyStarted=Canal ya iniciado para nivel:[{0}]
channelCoordinator.invalid.startLevel=Nivel de inicion inválido, los niveles válidos son:SND_RX_SEQ,SND_TX_SEQ,MBR_TX_SEQ,MBR_RX_SEQ\n
groupChannel.listener.alreadyExist=El escuchador ya existe:[{0}][{1}]
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
index ea47f45..fe54155 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_es.properties
@@ -20,6 +20,7 @@ engine.openSSLError=Error de OpenSSL: [{0}] mensage: [{1}]\n
engine.writeToSSLFailed=Fallo al escribir hacia SSL, resultado: [{0}]
openssl.addedClientCaCert=Ceritifcado CA de cliente adicionado: [{0}]
+openssl.keyManagerMissing=No se encontró gerente de llave
openssl.trustManagerMissing=No se encontró un manejador confiable
opensslconf.checkFailed=Fallo mientras se chequeaba OpenSSLConf\n
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8370d7d..ba638f4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -187,6 +187,10 @@
<add>
Improvements to Korean translations. (woonsan)
</add>
+ <add>
+ Improvements to Spanish translations. Provided by Andrewlanecarr.
+ (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/08: Correct replacement, fix format
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0fb435b63711fcb925f226263317055bfd6e2ca4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:40:43 2020 +0100
Correct replacement, fix format
---
java/org/apache/coyote/http2/LocalStrings.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 2b9c586..2c17966 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -59,7 +59,7 @@ http2Parser.processFrame=Connection [{0}], Stream [{1}], Frame type [{2}], Flags
http2Parser.processFrame.tooMuchPadding=Connection [{0}], Stream [{1}], The padding length [{2}] was too big for the payload [{3}]
http2Parser.processFrame.unexpectedType=Expected frame type [{0}] but received frame type [{1}]
http2Parser.processFrameContinuation.notExpected=Connection [{0}], Continuation frame received for stream [{1}] when no headers were in progress
-http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data length, [{2}], Padding length [{3}]
+http2Parser.processFrameData.lengths=Connection [{0}], Stream [{1}], Data length [{2}], Padding length [{3}]
http2Parser.processFrameData.window=Connection [{0}], Client sent more data than stream window allowed
http2Parser.processFrameHeaders.decodingDataLeft=Data left over after HPACK decoding - it should have been consumed
http2Parser.processFrameHeaders.decodingFailed=There was an error during the HPACK decoding of HTTP headers
@@ -79,7 +79,7 @@ stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must b
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header [connection] is not permitted in an HTTP/2 request
stream.header.contentLength=Connection [{0}], Stream [{1}], The content length header value [{2}] does not agree with the size of the data received [{3}]
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value [{3}]
-stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple [{3}] headers
+stream.header.duplicate=Connection [{0}], Stream [{1}], received multiple [{2}] headers
stream.header.empty=Connection [{0}], Stream [{1}], Invalid empty header name
stream.header.invalid=Connection [{0}], Stream [{1}], The header [{2}] contained invalid value [{3}]
stream.header.noPath=Connection [{0}], Stream [{1}], The [:path] pseudo header was empty
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org