This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 7b01ab71c4 Improvements to Chinese translations by Ch_jp
7b01ab71c4 is described below
commit 7b01ab71c4ea2b59885ff4f5fd00d5b17dce302a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 2 15:11:47 2024 +0100
Improvements to Chinese translations by Ch_jp
---
java/jakarta/el/LocalStrings_zh_CN.properties | 8 ++++----
java/jakarta/servlet/LocalStrings_zh_CN.properties | 2 +-
java/jakarta/servlet/http/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 10 +++++-----
java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/coyote/LocalStrings_zh_CN.properties | 4 ++--
.../apache/coyote/http11/filters/LocalStrings_zh_CN.properties | 10 +++++-----
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 -
webapps/docs/changelog.xml | 6 +++++-
9 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_zh_CN.properties
b/java/jakarta/el/LocalStrings_zh_CN.properties
index 3a12ce1b29..267a7e89cd 100644
--- a/java/jakarta/el/LocalStrings_zh_CN.properties
+++ b/java/jakarta/el/LocalStrings_zh_CN.properties
@@ -32,16 +32,16 @@ expressionFactory.readFailed=未能读取 [{0}]
importHandler.ambiguousImport=未能导入类 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.ambiguousStaticImport=未能处理静态导入 [{0}]，因为它和已导入的 [{1}] 冲突
importHandler.classNotFound=未能导入类 [{0}]，因为找不到该类
-importHandler.invalidClass=在导出的包中（对于 Java 9+），类 [{0}] 必须是公用的，非抽象并且非接口
+importHandler.invalidClass=类[{0}]必须是公共的、非抽象的、非接口，且在导出包中（对于Java 9+）
importHandler.invalidClassName=要导入的类的名称 [{0}] 必须包含软件包
importHandler.invalidClassNameForStatic=为静态导入 [{1}] 指定的类 [{0}] 无效
importHandler.invalidStaticName=要导入的静态方法或字段的名称 [{0}] 必须包含类
importHandler.staticNotFound=在导入 [{2}] 的类 [{1}] 中找不到静态导入 [{0}]
-lambdaExpression.tooFewArgs=对于至少需要 [{1}] 的 lambda 表达式，仅提供了 [{0}] 个自变量
+lambdaExpression.tooFewArgs=对于至少需要 [{1}] 个参数的 lambda 表达式，仅提供了 [{0}] 个参数
-objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象阵列
-propertyNotFound=在类型 [{0}] 上未找到属性 [{1}]
+objectNotAssignable=无法将类型为 [{0}] 的对象添加到类型为 [{1}] 的对象数组
+propertyNotFound=属性 [{1}] 在类型 [{0}] 上不存在
propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读
propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写
propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错
diff --git a/java/jakarta/servlet/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/LocalStrings_zh_CN.properties
index 6598f10035..32a05cd2cd 100644
--- a/java/jakarta/servlet/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
-httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+httpMethodConstraintElement.invalidMethod=无效的HTTP方法
value.false=否
value.true=true
diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index 7492ccd46a..f98ead3878 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -19,7 +19,7 @@
cookie.attribute.invalidName.notToken=Cookie属性名[{0}]无效,因为它不是令牌
cookie.attribute.invalidName.null=Cookie属性名称不能为空
-err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_blank=Cookie名称不能为空
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 69e59a73b0..c6d9077aa5 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -192,8 +192,8 @@ standardContext.filterStart=启动过滤器异常[{0}]
standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
standardContext.isUnavailable=此应用程序目前不可用
standardContext.listenerFail=一个或多个listeners启动失败，更多详细信息查看对应的容器日志文件
-standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
-standardContext.listenerStop=例外情况发送上下文删除事件[{0}]，以便列表实例
+standardContext.listenerStart=发送上下文初始化事件到类的侦听器实例 [{0}] 时出现异常
+standardContext.listenerStop=发送上下文销毁事件到类的侦听器实例 [{0}] 时出现异常
standardContext.loadOnStartup.loadException=web应用程序[{0}]中的Servlet[{1}]引发了load（）异常
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
@@ -256,9 +256,9 @@ standardHostValve.customStatusFailed=无法正确调度自定义错误页[{0}]
standardPipeline.basic.start=启动新基本阀时出错
standardPipeline.basic.stop=停止旧基本阀时出错
-standardPipeline.valve.destroy=破坏阀门错误
-standardPipeline.valve.start=错误启动阀
-standardPipeline.valve.stop=错误截止阀
+standardPipeline.valve.destroy=销毁阀时出错
+standardPipeline.valve.start=启动阀时出错
+standardPipeline.valve.stop=停止阀时出错
standardServer.accept.error=尝试在侦听shutdown命令的套接字上接受IO异常
standardServer.accept.readError=尝试读取关机命令时发生IO异常
diff --git a/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
index 4964234a69..5daf387746 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
@@ -24,5 +24,5 @@ namingResources.cleanupNoResource=无法检索容器[{1}]的JNDI资源[{0}]，
namingResources.ejbLookupLink=EJB的引用[{0}]同时指定了ejb-link和lookup-name
namingResources.envEntryLookupValue=环境参数 [{0}] 指定查询名称和值
namingResources.mbeanCreateFail=为命名资源[{0}]创建MBean失败
-namingResources.mbeanDestroyFail=失败的销毁命名资源[{0}]为MBean
+namingResources.mbeanDestroyFail=为命名资源[{0}]销毁MBean失败
namingResources.resourceTypeFail=名为[{0}]的JNDI资源是类型[{1}]，但是该类型与为该资源配置的注入目标的类型不一致
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 20c4756c95..ea25d251ce 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -44,7 +44,7 @@ abstractProtocol.waitingProcessor.add=添加处理器[{0}]到等待队列
abstractProtocol.waitingProcessor.remove=将从等待的处理器中移除处理器[{0}]
abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时
-abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
+abstractProtocolHandler.destroy=正在销毁协议处理器 [{0}]
abstractProtocolHandler.init=初始化协议处理器 [{0}]
abstractProtocolHandler.pause=暂停ProtocolHandler[{0}]
abstractProtocolHandler.portOffset=ProtocolHandler[{0}]的基本端口为[{1}]，端口偏移量为[{2}]
@@ -65,7 +65,7 @@ request.nullReadListener=传递给setReadListener（）的侦听器不能为空
request.readListenerSet=已设置非阻塞读取侦听器
response.encoding.invalid=JRE无法识别编码[{0}]
-response.noTrailers.notSupported=不能为此响应设置拖车字段供应商。底层协议不支持尾部字段，或者协议要求在提交响应之前设置供应商
+response.noTrailers.notSupported=不能为此响应设置trailers尾部部分。底层协议不支持尾部字段，或者协议要求在提交响应之前设置尾部字段
response.notAsync=只有在异步处理或HTTP升级处理中切换到非阻塞IO才有效
response.nullWriteListener=传递给setWriteListener（）的侦听器不能为空
response.writeListenerSet=非阻塞的写入监听器已经被设置.
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 7d437da8de..e9f72ca840 100644
--- a/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
@@ -16,15 +16,15 @@
# Do not edit this file directly.
# To edit transaltions see:
https://tomcat.apache.org/getinvolved.html#Translations
-chunkedInputFilter.eos=读取请求主体时流的意外结束
+chunkedInputFilter.eos=读取请求正文流异常
chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
-chunkedInputFilter.error=没有数据可用由于先前的错误
+chunkedInputFilter.error=由于先前的错误导致没有可用数据
chunkedInputFilter.invalidCrlf=行尾序列无效（找到除CR或LF以外的字符）
chunkedInputFilter.invalidCrlfCRCR=无效的结束的行序列（CRCR)
chunkedInputFilter.invalidCrlfNoCR=无效的行尾结束符(换行前缺少回车)
chunkedInputFilter.invalidCrlfNoData=无效的行尾序列（没有可读取的数据）
chunkedInputFilter.invalidHeader=无效的块
-chunkedInputFilter.maxExtension=超过最大扩展数
-chunkedInputFilter.maxTrailer=超过最大数
+chunkedInputFilter.maxExtension=maxExtension超出
+chunkedInputFilter.maxTrailer=maxTrailerSize超出
-inputFilter.maxSwallow=最大吞咽数据大小超出异常
+inputFilter.maxSwallow=maxSwallowSize超出
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 339ad3208f..58b4c20989 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -108,7 +108,6 @@ stream.inputBuffer.signal=读线程在等待时，数据被添加到inBuffer中
stream.inputBuffer.swallowUnread=先前读取到输入流缓冲区吞入了[{0}]个字节
stream.notWritable=连接[{0}]，流[{1}]，此流不可写
stream.outputBuffer.flush.debug=连接[{0}]，流[{1}]，用缓冲区在位置[{2}]刷新输出，writeInProgress[{3}]并关闭了[{4}]
-stream.recycle=连接[{0}]，流[{1}]将被回收
stream.reset.fail=连接[{0}]，流[{1}]，重置流失败
stream.reset.receive=连接[{0}]，流[{1}]，由于[{2}]而收到重置
stream.reset.send=连接[{0}]，流[{1}]，由于[{2}]将重置发送
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 43cb5141bf..d9a2af27b2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,12 +225,16 @@
</update>
<update>
Update CheckStyle to 10.18.2. (markt)
- </update>0 <add>
+ </update>
+ <add>
Improvements to French translations. (remm)
</add>
<add>
Improvements to Japanese translations by tak7iji. (markt)
</add>
+ <add>
+ Improvements to Chinese translations by Ch_jp. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
