This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e616cb242bebe1a482fedbdc0f401322f78fc07e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 26 17:13:52 2021 +0000
Improvements to Chinese translations. Provided by shawn.
---
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/util/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 3 +++
8 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 0dc5906..54659c4 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -58,7 +58,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 53fe7c5..2d4ccab 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -63,6 +63,7 @@ deltaManager.waitForSessionState=管理器[{0}]，正在从[{1}]请求会话状
deltaRequest.showPrincipal=Principal [{0}] 和session [{1}]产生关联。
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/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 ad710fb..ecd1159 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -123,6 +123,7 @@ 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 e5f5c20..a3233b9 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@
abstractConnectionHandler.socketexception.debug=(:SocketException是正常的，
abstractProcessor.fallToDebug=\n\
\ 注意：更多的请求解析错误将以DEBUG级别日志进行记录。
abstractProcessor.hostInvalid=[{0}] 是无效主机
+abstractProcessor.setErrorState=正在处理请求时出现错误状态[{0}]
abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
abstractProtocolHandler.init=初始化协议处理器 [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index dc0b6b9..1cf74fe 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -26,5 +26,6 @@ ajpprocessor.header.error=头部信息解析失败
ajpprocessor.header.tooLong=已收到长度为[{0}]的头消息，但packetSize仅为[{1}]
ajpprocessor.request.prepare=准备请求错误
ajpprocessor.request.process=处理请求错误
+ajpprocessor.unknownAttribute=由于请求属性[{0}]接收自反向代理，请求被拒绝
ajpprotocol.noSecret=AJP连接器配置secretRequired="true",但是属性secret确实空或者空字符串，这样的组合是无效的。
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/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 40d5310..985e43f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,9 @@
<add>
Improvements to Russian translations. Provided by Azat. (mark)
</add>
+ <add>
+ Improvements to Chinese translations. Provided by shawn. (mark)
+ </add>
</changelog>
</subsection></section>
<section name="Tomcat 7.0.108 (violetagg)" rtext="released 2021-02-05">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
