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 f0c1c8fea5e991c0eb377b630c8a3985148cfb72
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 26 16:53:04 2021 +0000
Improvements to Chinese translations. Provided by shawn.
---
java/javax/el/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/util/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 ++-
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 3 +++
15 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/java/javax/el/LocalStrings_zh_CN.properties
b/java/javax/el/LocalStrings_zh_CN.properties
index 406d6a9..b8cc58b 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -31,7 +31,7 @@ importHandler.ambiguousStaticImport=无法处理静态导入[{0}]，因为它与
importHandler.classNotFound=无法导入类[{0}]，因为无法找到它
importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口且（对于Java 9+）在一个导出包
importHandler.invalidClassName=要导入的类的名称[{0}]必须包含一个包。
-importHandler.invalidClassNameForStatic=为 static import [{1}] 指定的类 [{0}] 不可用
+importHandler.invalidClassNameForStatic=类[{0}]指定的静态导入[{1}]无效
importHandler.invalidStaticName=导入 [{0}] 的静态方法或字段名称必须包含类
importHandler.staticNotFound=导入[{2}]的类[{1}]中找不到静态导入[{0}]
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 68b8427..f74c009 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -61,7 +61,7 @@ singleSignOn.debug.sessionTimeout=SSO正在处理SSO会话[{0}]和应用程序
singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
singleSignOn.sessionExpire.contextNotFound=SSO无法中止[{0}]，因为Context未找到
singleSignOn.sessionExpire.engineNull=SSO无法使会话[{0}]过期，因为引擎为空。
-singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效
+singleSignOn.sessionExpire.hostNotFound=由于无法找到主机，单点登录无法使会话[{0}]过期
singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录无法使会话[{0}]失效
singleSignOn.sessionExpire.managerNotFound=SSO无法使会话[{0}]过期，因为找不到管理器
singleSignOn.sessionExpire.sessionNotFound=SSO无法使会话[{0}]过期，因为找不到该会话
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 0f760f8..4047b82 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -69,6 +69,7 @@ deltaRequest.ssid.mismatch=回话ID不匹配，不执行delta请求
deltaRequest.ssid.null=setSessionId的会话Id为空
deltaRequest.wrongPrincipalClass=ClusterManager仅支持GenericPrincipal。
你的Realm使用的Principal类为[{0}]。
+deltaSession.notifying=通知群集会话过期：primary=[{1}]，sessionId[{2}]
deltaSession.readSession=readObject（）正在加载会话[{0}]
deltaSession.writeSession=writeObject()存储会话[{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 2aa895d..2d63fbf 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -65,6 +65,7 @@ contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须
contextConfig.missingRealm=对应的认证领域未配置
contextConfig.noAntiLocking=配置
java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
+contextConfig.processAnnotationsInParallelFailure=并行执行失败
contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件
contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class
文件
contextConfig.resourceJarFail=无法处理在URL[{0}]处找到的JAR，以便将静态资源包含在名为[{1}]的上下文中
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 4ad7254..9812536 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -16,7 +16,7 @@
SecurityUtil.doAsPrivilege=运行PrivilegedExceptionAction块时发生异常。
customObjectInputStream.logRequired=使用日志记录进行类名过滤需要一个有效的日志记录器
-customObjectInputStream.nomatch=类不能匹配合适的表达式，因为类被允许反序列化
+customObjectInputStream.nomatch=因为类允许被反序列化，类[{0}]未能匹配常规的表达式[{1}]
extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]:
请求的拓展[{2}]未找到。
extensionValidator.extension-validation-error=扩展验证程序[{0}]：找不到[{1}]所需的扩展。
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 7a47a98..83f3e10 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -130,11 +130,13 @@ jdbcAccessLogValve.exception=执行插入访问项时发生异常
persistentValve.filter.failure=无法编译filter=[{0}]
remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息，请参阅以前的消息
+remoteCidrValve.noPort=请求不含有合法的服务器端口号。请求被拒绝。
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}]
remoteIpValve.invalidHostWithPort=HTTP头[{1}]中的主机值[{0}]包含将被忽略的端口号
remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效
+remoteIpValve.invalidRemoteAddress=无法确定远程主机，因为发布的远程地址[{0}]是非法的
requestFilterValve.configInvalid=为Remote [Addr |
Host]阀门提供了一个或多个无效配置设置，阻止Valve及其父容器启动
requestFilterValve.deny=根据[{1}]配置拒绝[{0}]的请求
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 864cbfa..8179921f 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -31,6 +31,7 @@ abstractProcessor.hostInvalid=[{0}] 是无效主机
abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
abstractProcessor.noExecute=无法将处理传输到容器线程，因为此处理器当前未与SocketWrapper关联
abstractProcessor.pushrequest.notsupported=此协议不支持服务器推送请求
+abstractProcessor.setErrorState=正在处理请求时出现错误状态[{0}]
abstractProcessor.socket.ssl=获取SSL属性异常
abstractProtocol.mbeanDeregistrationFailed=无法从MBean服务器[{1}]中注销名为[{0}]的MBean
@@ -64,4 +65,4 @@ response.noTrailers.notSupported=不能为此响应设置拖车字段供应商
response.notAsync=只有在异步处理或HTTP升级处理中切换到非阻塞IO才有效
response.notNonBlocking=当响应尚未进入非阻塞模式时，调用 isReady() 无效
response.nullWriteListener=传递给setWriteListener（）的侦听器不能为空
-response.writeListenerSet=非阻塞的写监听已经被设置.
+response.writeListenerSet=非阻塞的写入监听器已经被设置.
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index 3b4d026..fea4410 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -26,6 +26,7 @@ ajpprocessor.header.tooLong=已收到长度为[{0}]的头消息，但packetSize
ajpprocessor.readtimeout=从Socket读取数据超时
ajpprocessor.request.prepare=准备请求错误
ajpprocessor.request.process=处理请求错误
+ajpprocessor.unknownAttribute=由于请求属性[{0}]接收自反向代理，请求被拒绝
ajpprotocol.noSSL=AJP不支持SSL。[{0}]的SSL主机配置被忽略
ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串，这样的组合是无效的。
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 9429a95..27ab721 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -16,6 +16,7 @@
abstractHttp11Protocol.alpnConfigured=[{0}]连接器已配置为支持通过ALPN与[{1}]协商。
abstractHttp11Protocol.alpnWithNoAlpn=[{1}]的升级处理程序[{0}]仅支持通过ALPN升级，但已为不支持ALPN的[{2}]连接器配置
abstractHttp11Protocol.httpUpgradeConfigured=[{0}]连接器已配置为支持HTTP升级到[{1}]
+abstractHttp11Protocol.upgradeJmxRegistrationFail=JMX升级协议注册失败
http11processor.fallToDebug=\n\
\ 注意：HTTP请求解析错误的进一步发生将记录在DEBUG级别。
diff --git
a/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
index 7661321..11bed70 100644
--- a/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
@@ -18,7 +18,7 @@ chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
chunkedInputFilter.error=没有数据可用由于先前的错误
chunkedInputFilter.invalidCrlf=行尾序列无效（找到除CR或LF以外的字符）
chunkedInputFilter.invalidCrlfCRCR=无效的结束的行序列（CRCR)
-chunkedInputFilter.invalidCrlfNoCR=无效的行尾结束符序列(LF前缺少CR)
+chunkedInputFilter.invalidCrlfNoCR=无效的行尾结束符(换行前缺少回车)
chunkedInputFilter.invalidCrlfNoData=无效的行尾序列（没有可读取的数据）
chunkedInputFilter.invalidHeader=无效的块
chunkedInputFilter.maxExtension=超过最大扩展数
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index f1808a2..2ac0846 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -126,7 +126,7 @@ upgradeHandler.ioerror=连接[{0}]
upgradeHandler.noAllocation=连接[{0}]，流[{1}]，等待分配超时
upgradeHandler.noNewStreams=连接{0}，流{1}，忽略流，因为此连接上不允许有新的流
upgradeHandler.pause.entry=连接[{0}]正在暂停
-upgradeHandler.pingFailed=对客户端发送ping 链接失败.
+upgradeHandler.pingFailed=连接[{0}]对客户端发送ping失败.
upgradeHandler.prefaceReceived=连接[{0}]，从客户端收到连接准备。
upgradeHandler.pruneIncomplete=连接[{0}]，流[{1}]，无法完全修剪连接，因为有[{2}]个活动流太多
upgradeHandler.pruneStart=连接[{0}]正在开始修剪旧流。限制为[{1}]，当前有[{2}]个流。
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
index 961bb12..675f1f4 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
@@ -19,3 +19,4 @@ jre9Compat.unexpected=创建对Java 9类的依赖和方法失败
jreCompat.noApplicationProtocol=Java 运行时不支持
SSLEngine.getApplicationProtocol()。要使用该功能你必须使用 Java 9。
jreCompat.noApplicationProtocols=Java
Runtime不支持SSLParamerters.setApplicationProtocols(),必须使用Java 9才能使用这个特性。
+jreCompat.noUnixDomainSocket=Java运行环境不支持Unix域名套接字。你必须使用Java16来运行该特性。
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 b5c32c8..1121c2a 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -146,6 +146,7 @@ nioBlockingSelector.selectError=选择键时出错
sniExtractor.clientHelloInvalid=ClientHello信息未正常格式化
sniExtractor.clientHelloTooBig=):ClientHello 没有出现在单个TLS记录中，因此无法提取SNI信息
+sniExtractor.tooEarly=在客户端问候被解析之前调用这个方法是非法的
socket.apr.clientAbort=客户端中止连接。
socket.apr.closed=与该链接所关联的 socket [{0}] 被关闭
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 06aa5f6..71b16d6 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -113,6 +113,7 @@ wsSession.unknownHandler=无法添加消息处理程序[{0}]，因为它是针
wsSession.unknownHandlerType=无法添加消息处理程序[{0}]，因为它被包装为无法识别的类型[{1}]。
wsWebSocketContainer.asynchronousSocketChannelFail=无法打开与服务器的连接
+wsWebSocketContainer.connect.entry=连接[{0}]类型的终端实例至[{1}]
wsWebSocketContainer.defaultConfiguratorFail=无法创建默认配置程序。
wsWebSocketContainer.endpointCreateFail=未能创建类型为[{0}]的本地终结点
wsWebSocketContainer.failedAuthentication=无法处理http响应代码[{0}]。服务器不接受身份验证头。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc72443..14f9e8c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,9 @@
<add>
Improvements to Russian translations. Provided by Azat. (mark)
</add>
+ <add>
+ Improvements to Chinese translations. Provided by shawn. (mark)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
