This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit de89c23c65a66a381c3cd1a236effb0645ca2471
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 7 10:02:45 2021 +0100
Improvements to Chinese translations. Provided by bytesgo
---
java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/util/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 3 +++
7 files changed, 10 insertions(+)
diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index 81536ee..9982795 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -58,6 +58,7 @@ remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
remoteIpFilter.invalidNumber=参数[{0}]的数字非法：[{1}]
+remoteIpFilter.invalidRemoteAddress=无法确定远程主机，因为上报的远程地址[{0}]是无效的
requestFilter.deny=基于属性:[{1}]，[{0}]的请求被拒绝。
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 25ed325..c5ef40b 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -133,6 +133,7 @@ hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
+hostConfig.migrateError=迁移失败
hostConfig.reload=重新加载上下文[{0}]
hostConfig.resourceNotAbsolute=无法从上下文[{0}]中删除资源，因为[{1}]不是绝对路径
hostConfig.start=HostConfig: 开始处理
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 9812536..5a40c92 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -42,6 +42,7 @@ netmask.cidrNegative=CIDR [{0}]为负数。
netmask.cidrNotNumeric=CIDR[{0}]不是数字
netmask.cidrTooBig=CIDR[{0}]大于地址长度[{1}]
netmask.invalidAddress=地址 [{0}] 无效
+netmask.invalidPort=正则[{0}]中的端口部分是无效的
parameterMap.locked=不允许修改锁定的参数映射
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 2ac0846..734685d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -73,6 +73,8 @@ http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小
http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
+http2Protocol.jmxRegistration.fail=HTTP/2协议注册JMX失败
+
pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns
stream.clientCancel=客户端在响应完成前重置了数据流
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index b26f1d6..1d95c7d 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=对于一下简单的标记符，用于类[{0
jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 行发生了一个错误
jsp.error.stream.close.failed=流.关闭失败
jsp.error.stream.closed=流.关闭
+jsp.error.string_interpreter_class.instantiation=加载或者实例化StringInterpreter类
[{0}]失败
jsp.error.tag.conflict.attr=Tag指令：具有多个具有不同值的属性{0}的重复出现是非法的（旧的：[{1}，新的：[{2}]）
jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag指令：具有多个具有不同值的“deferredSyntaxAllowedAsLiteral”（旧值：[{0}），新值：[{1}）的重复出现是非法的。
jsp.error.tag.conflict.iselignored=TAG指令：多次出现不同值的“isELIgnored”(旧：[{0}]，New：[{1}])
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 1121c2a..6d50b76 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -88,6 +88,7 @@ endpoint.init.bind=套接字绑定失败: [{0}] [{1}]
endpoint.init.bind.inherited=连接器配置为使用继承通道时没有继承通道
endpoint.init.listen=套接字侦听失败：[{0}][{1}]
endpoint.init.notavail=APR.不可用
+endpoint.init.unixnotavail=不支持域套接字
endpoint.invalidJmxNameSslHost=无法为与主机[{0}]关联的SSLHostConfig生成有效的JMX对象名
endpoint.invalidJmxNameSslHostCert=对于SSLHostConfigCertificate关联的主机[{0}]和证书类型[{1}]，无法生成有效的XML对象名称
endpoint.jmxRegistrationFailed=未能使用名称[{0}]注册JMX对象
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f1ca839..d1b8b4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,6 +225,9 @@
more precise configuration if needed. The system property source will
still always be enabled. (remm)
</fix>
+ <add>
+ Improvements to Chinese translations. Provided by bytesgo. (mark)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
