This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 59870df Improvements to Chinese translations
59870df is described below
commit 59870dfc2f6c1b2e8e5816656fd977287774a138
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 26 17:15:02 2021 +0100
Improvements to Chinese translations
Contributed by ZhangJieWen and chengzheyan
---
java/jakarta/servlet/http/LocalStrings_zh_CN.properties | 4 ++++
.../authenticator/jaspic/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/loader/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/servlets/LocalStrings_zh_CN.properties | 1 +
.../org/apache/catalina/startup/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++
.../catalina/webresources/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 11 +++++++++++
.../org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../apache/tomcat/util/compat/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 2 ++
.../tomcat/util/net/openssl/LocalStrings_zh_CN.properties | 2 ++
.../org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 7 +++++++
.../tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 2 ++
webapps/docs/changelog.xml | 8 ++++++++
20 files changed, 57 insertions(+)
diff --git a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
index d74232e..04f0508 100644
--- a/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/jakarta/servlet/http/LocalStrings_zh_CN.properties
@@ -13,11 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cookie.attribute.invalidName.notToken=Cookie属性名[{0}]无效,因为它不是令牌
+cookie.attribute.invalidName.null=Cookie属性名称不能为空
+
err.cookie_name_blank=Cookie名称不能为null或零长度
err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
err.io.nullArray=Null在write方法中传递给字节数组
err.io.short_read=短.读
+err.state.commit=响应一旦被提交后就没有准许
http.method_delete_not_supported=当前URL不支持HTTP的DELETE方法
http.method_get_not_supported=此URL不支持Http方法GET
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index 8de2b56..e5ce28b 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -19,7 +19,9 @@ authConfigFactoryImpl.registerInstance=正在为层[{1}]和应用程序上下文
authConfigFactoryImpl.zeroLengthAppContext=应用上下文名称的长度为0是无效的
authConfigFactoryImpl.zeroLengthMessageLayer=零长度的消息层名称是无效的
+callbackHandlerImpl.containerMissing=类型[{0}]的JASPIC回调缺少容器，已被忽略
callbackHandlerImpl.jaspicCallbackMissing=接收到不支持的类型为{0}的JASPIC回调，该回调被忽略
+callbackHandlerImpl.realmMissing=容器[{1}]中类型为[{0}]的JASPIC回调缺少realm,该realm已被忽略
jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index aa9eec0..f840c8d 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -248,6 +248,7 @@ standardHost.noContext=没有配置上下文来处理此请求
standardHost.notContext=主机的子节点必须有上下文
standardHost.nullName=主机名是必需的
standardHost.problematicAppBase=在主机[{0}]上为appBase使用空字符串会将其设置为CATALINA_BASE，这是一个坏主意
+standardHost.problematicLegacyAppBase=在主机[{0}]上为legacyAppBase使用空字符串会将其设置为CATALINA_BASE，这是个坏主意
standardHostValue.customStatusFailed=无法正确调度自定义错误页[{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 1f9de7d..8ecd37d 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+webappClassLoader.addExportsJavaIo=在Java 9或更高版本上运行时,需要向JVM命令行参数中添加"--add
opens=Java.base/Java.io={0}",以启用ObjectStream缓存内存泄漏保护.或者，可以通过禁用ObjectStream类缓存内存泄漏保护来抑制此警告.
webappClassLoader.addExportsRmi=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.rmi/sun.rmi.transport=ALL-UNNAMED”，以启用rmi目标内存泄漏检测。或者，可以通过禁用RMI目标内存泄漏检测来抑制此警告。
webappClassLoader.addExportsThreadLocal=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.base/Java.lang=ALL-UNNAMED”，以启用线程本地内存泄漏检测。或者，可以通过禁用ThreadLocal内存泄漏检测来抑制此警告。
webappClassLoader.addPermissionNoCanonicalFile=无法从URL[{0}]获取规范文件路径
@@ -66,3 +67,4 @@ webappLoader.starting=启动此加载程序
webappLoader.stopError=停止加载程序时出错
webappLoader.stopping=停止此加载程序
webappLoader.unknownClassLoader=类[{1}]的未知类加载器[{0}]
+webappLoader.unknownProfile=指定了未知的Jakarta概述文件[{0}]，将改用默认的概述文件
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 988c33b..4143213 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -29,7 +29,9 @@ mBean.nullName=属性名为空
mBeanDumper.getAttributeError=获取对象名[{1}]的属性[{0}]时出错
+mBeanFactory.contextCreate.addServicedFail=无法创建上下文[{0}]，因为另一个组件正在为具有该名称的上下文提供服务
mBeanFactory.contextDestroyError=上下文[{0}]销毁期间出错
+mBeanFactory.contextRemove.addServicedFail=无法移除上下文[{0}]，因为另一个组件正在为具有该名称的上下文提供服务
mBeanFactory.managerContext=管理器组件只能添加到上下文中。
mBeanFactory.noDeployer=找不到主机[{0}]的部署程序
mBeanFactory.noService=找不到域为[{0}]的服务
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index ae4fffb..740bfee 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=认证用户[{0}]，权限[{1}]
combinedRealm.getPassword=永远不应该调用getPassword（）方法
combinedRealm.getPrincipal=方法getPrincipal()永远不应该被调用
combinedRealm.realmStartFail=无法启动[{0}]领域
+combinedRealm.setCredentialHandler=在CombinedRealm的实例(或CombinedRealm的子类)上设置了CredentialHandler.CombinedRealm不使用配置的CredentialHandler.这是配置错误吗?
combinedRealm.unexpectedMethod=对组合域上的方法进行了意外调用
credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字符串[{0}]，以便与用户提供的凭据匹配
diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index b28dc2c..9c76416 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -42,6 +42,7 @@ defaultServlet.missingResource=请求的资源[{0}]不可用
defaultServlet.noResources=找不到静态资源
defaultServlet.readerCloseFailed=无法关闭读卡器
defaultServlet.skipfail=读取失败，因为只有[{0}]个字节可用，但需要跳过[{1}]个字节才能到达请求范围的开始
+defaultServlet.unknownBomConfig=为useBomIfPresent初始化参数提供的[{0}]值无法识别
defaultServlet.xslError=XSL转换器错误
directory.filename=文件名
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index c5ef40b..66d2f18 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -14,10 +14,12 @@
# limitations under the License.
catalina.configFail=无法从[{0}]加载服务器配置
+catalina.generatedCodeLocationError=为生成的Tomcat嵌入代码[{0}]使用配置的位置时出错
catalina.incorrectPermissions=权限错误，此文件没有读取权限
catalina.init=服务器在[{0}]毫秒内初始化
catalina.initError=初始化 Catalina 时出错
catalina.noCluster=由于[{0}]未找到群集Ruleset。已禁用群集配置。
+catalina.noLoader=配置的代码加载器[{0}]没有找到,生成的代码不会被使用
catalina.noNaming=命名环境已禁用
catalina.noServer=无法启动服务器，服务器实例未配置
catalina.serverStartFail=所必需的服务组件启动失败，所以无法启动Tomcat
@@ -133,6 +135,7 @@ hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
+hostConfig.migrateApp.threaded.error=等待遗留应用程序的多线程迁移完成时出错
hostConfig.migrateError=迁移失败
hostConfig.reload=重新加载上下文[{0}]
hostConfig.resourceNotAbsolute=无法从上下文[{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 83f3e10..15b734d 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -18,6 +18,7 @@ accessLogValve.closeFail=关闭访问日志文件失败
accessLogValve.deleteFail=未能删除旧的访问日志[{0}]
accessLogValve.invalidLocale=无法将区域设置设为 [{0}]
accessLogValve.invalidPortType=端口类型 [{0}] 无效，使用服务器（本地）端口
+accessLogValve.invalidRemoteAddressType=远程地址类型[{0}]无效,使用远程(非对等)地址
accessLogValve.openDirFail=无法为访问日志创建目录[{0}]。
accessLogValve.openFail=无法打开访问日志文件[{0}]。
accessLogValve.renameFail=无法将访问日志从[{0}]重命名为[{1}]。
@@ -132,6 +133,7 @@ persistentValve.filter.failure=无法编译filter=[{0}]
remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息，请参阅以前的消息
remoteCidrValve.noPort=请求不含有合法的服务器端口号。请求被拒绝。
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
+remoteCidrValve.unexpectedPort=请求包含服务器端口,但连接器配置属性addConnectorPort为false.请求被拒绝.
remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}]
remoteIpValve.invalidHostWithPort=HTTP头[{1}]中的主机值[{0}]包含将被忽略的端口号
diff --git
a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
index 6eca519..c52f9c4 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@
abstractArchiveResourceSet.setReadOnlyFalse=基于存档的WebResourceSets
如基于jar的WebResourceSets 硬编码为只读，并且不能配置为读写
+abstractFileResourceSet.canonicalfileCheckFailed=路径[{1}]处的web应用程序[{0}]的资源未加载,因为规范链接[{2}]不匹配.使用符号链接是一个可能的原因.
+
abstractResource.getContentFail=无法把[{0}]作为byte数组返回
abstractResource.getContentTooLarge=无法返回[{0}]作为字节数组，因为资源的大小[[1]]个字节大于字节数组的最大大小
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 8179921f..12901d1 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -34,6 +34,7 @@ abstractProcessor.pushrequest.notsupported=此协议不支持服务器推送请
abstractProcessor.setErrorState=正在处理请求时出现错误状态[{0}]
abstractProcessor.socket.ssl=获取SSL属性异常
+abstractProtocol.closeConnectionsAwait=等待[{0}]毫秒,等待到[{1}]的现有连接完成并关闭。
abstractProtocol.mbeanDeregistrationFailed=无法从MBean服务器[{1}]中注销名为[{0}]的MBean
abstractProtocol.processorRegisterError=注册请求处理器错误
abstractProtocol.processorUnregisterError=注销请求处理器错误
@@ -51,6 +52,7 @@ abstractProtocolHandler.start=开始协议处理句柄[{0}]
abstractProtocolHandler.stop=正在停止ProtocolHandler [{0}]
asyncStateMachine.invalidAsyncState=调用[{0}]对于具有异步状态[{1}]的请求无效
+asyncStateMachine.stateChange=正在将异步状态从[{0}]更改为[{1}]
compressionConfig.ContentEncodingParseFail=检查压缩是否已经在使用时，解析Content-Encoding头失败
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 27ab721..d4f2f1d 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.upgradeJmxNameFail=无法在JMX中创建用于注册升级协议的ObjectName
abstractHttp11Protocol.upgradeJmxRegistrationFail=JMX升级协议注册失败
http11processor.fallToDebug=\n\
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 734685d..e19aed3 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -35,11 +35,16 @@ hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因
hpackEncoder.encodeHeader=编码头[{0}]，值为[{1}]
+hpackdecoder.addDynamic=正在将头添加到名为[{1}]和值[{2}]动态表的索引[{0}]
+hpackdecoder.clearDynamic=清空动态表
+hpackdecoder.emitHeader=正在发出名为[{0}]值为[{1}]的头
hpackdecoder.headerTableIndexInvalid=头部表索引[{0}]无效，因为有[{1}]个静态实例和[{2}]个动态实例
hpackdecoder.maxMemorySizeExceeded=头表大小[{0}]超过了最大大小[{1}]
hpackdecoder.notImplemented=尚未实施
hpackdecoder.nullHeader=索引[{0}]处的头为空
hpackdecoder.tableSizeUpdateNotAtStart=任何表大小的更新都必须在头块开始时发送。
+hpackdecoder.useDynamic=从动态表的索引[{0}]使用头
+hpackdecoder.useStatic=从静态表的索引[{0}]使用头
hpackdecoder.zeroNotValidHeaderTableIndex=零不是有效的头表索引
hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=HPACK头中的Huffman编码值没有以EOS填充结束
@@ -97,6 +102,7 @@ stream.inputBuffer.empty=流输入缓冲区为空。等待更多数据
stream.inputBuffer.readTimeout=等待从客户端读取数据超时
stream.inputBuffer.reset=流.重置
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}]已回收
@@ -127,6 +133,7 @@ upgradeHandler.invalidPreface=连接[{0}]，连接前言无效
upgradeHandler.ioerror=连接[{0}]
upgradeHandler.noAllocation=连接[{0}]，流[{1}]，等待分配超时
upgradeHandler.noNewStreams=连接{0}，流{1}，忽略流，因为此连接上不允许有新的流
+upgradeHandler.overheadChange=连接[{0}]、流[{1}]、帧类型[{2}]产生新的系统开销数[{3}]
upgradeHandler.pause.entry=连接[{0}]正在暂停
upgradeHandler.pingFailed=连接[{0}]对客户端发送ping失败.
upgradeHandler.prefaceReceived=连接[{0}]，从客户端收到连接准备。
@@ -135,9 +142,11 @@ upgradeHandler.pruneStart=连接[{0}]正在开始修剪旧流。限制为[{1}]
upgradeHandler.pruned=连接[{0}]已修剪完成的流[{1}]
upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未使用的流[{1}]
upgradeHandler.releaseBacklog=连接[{0}]，流[{1}]已从待办事项列表中释放
+upgradeHandler.reset.receive=连接[{0}],流[{1}],由于[{2}]而重置
upgradeHandler.rst.debug=连接[{0}]，流[{1}]，错误[{2}]，消息[{3}]，RST（关闭流）
upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败
upgradeHandler.socketCloseFailed=关闭 socket 错误
+upgradeHandler.startRequestBodyFrame.result=连接[{0}],流[{1}]startRequestBodyFrame返回[{2}]
upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间
upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
\n
@@ -152,6 +161,8 @@
upgradeHandler.upgradeDispatch.entry=条目，连接[{0}]，SocketStatus [{1}]
upgradeHandler.upgradeDispatch.exit=退出，连接[{0}]， SocketState[{1}]
upgradeHandler.windowSizeReservationInterrupted=连接[{0}]，流[{1}]，保留[{2}]字节
upgradeHandler.windowSizeTooBig=连接[{0}]，流[{1}]，窗口太大
+upgradeHandler.windowUpdateConnection=连接[{0}],向客户端发送了窗口更新,将窗口增加[{1}]字节
+upgradeHandler.windowUpdateStream=连接[{0}],流[{1}]向客户端发送了窗口更新,将窗口增加[{2}]字节
upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}]
upgradeHandler.writeHeaders=连接 [{0}]，流 [{1}]
upgradeHandler.writePushHeaders=连接{0}、流{1}、推送流{2}、EndOfStream{3}
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 1938a58..77e7c64 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -300,6 +300,7 @@ jsp.warning.strictWhitespace=警告：无效的初始参数strictWhitespace值
jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false”
jsp.warning.tagPreDestroy=处理标记实例的preDestroy时出错[{0}]
jsp.warning.tagRelease=处理[{0}]的标记实例上的释放时出错
+jsp.warning.trimspaces=警告:initParam trimSpaces的值无效.将使用默认值"false"
jsp.warning.unknown.sourceVM=忽略未知源VM[{0}]
jsp.warning.unknown.targetVM=忽略未知目标VM[{0}]
jsp.warning.unsupported.sourceVM=不支持的源VM[{0}]请求，使用[{1}]
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 4c9ba3d..909c016 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+jre16Compat.javaPre16=类未找到，因此假设代码在Java16之前的JVM上运行
jre16Compat.unexpected=无法创建对Java16中类和方法的引用
jre9Compat.invalidModuleUri=提供的模块URI [{0}]无法转换为JarScanner要处理的URL
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 6f33320..b5669c5 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -98,6 +98,8 @@ endpoint.nio.keyProcessingError=处理选择键时出错
endpoint.nio.latchMustBeZero=闩锁必须为0或空
endpoint.nio.nullLatch=闩锁不能为空
endpoint.nio.nullSocketChannel=处理轮训事件时出现无效的空套接字通道
+endpoint.nio.perms.readFail=设置Unix域套接字[{0}]的读取权限失败
+endpoint.nio.perms.writeFail=设置Unix域套接字[{0}]的写取权限失败
endpoint.nio.pollerEventError=处理轮询器事件时出错
endpoint.nio.registerFail=无法用轮询器中的选择器注册套接字。
endpoint.nio.selectorCloseFail=关闭轮询器时未能关闭选择器
diff --git
a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
index 91b8354..4b5e093 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
@@ -17,8 +17,10 @@ engine.ciphersFailure=获取密码列表失败
engine.emptyCipherSuite=空密码套件
engine.engineClosed=引擎已经关闭
engine.failedCipherSuite=无法启用密码套件[{0}]
+engine.failedToReadAvailableBytes=有可读取的纯文本字节,但未读取任何字节
engine.inboundClose=入站在收到对等方的关闭通知之前关闭
engine.invalidBufferArray=偏移量：[{0}]，长度：[{1}]（应为：偏移量<=偏移量+长度<=srcs.length[{2}]）
+engine.invalidDestinationBuffersState=在打开字节包装时，目标缓冲区的状态发生了更改
engine.noRestrictSessionCreation=OpenSslEngine不允许限制引擎仅仅去唤醒已经存在的会话
engine.noSSLContext=没有SSL上下文
engine.noSession=SSL会话ID不可用
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 9a06489..61ac558 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -33,6 +33,9 @@ backgroundProcessManager.processFailed=后台进程失败
caseInsensitiveKeyMap.nullKey=不允许 Key 是 Null
+clientEndpointHolder.instanceCreationFailed=未能创建WebSocketEndpoint
+clientEndpointHolder.instanceRegistrationFailed=无法向InstanceManager注册Endpoint实例
+
futureToSendHandler.timeout=等待[{0}[{1}]完成后操作超时。
perMessageDeflate.alreadyClosed=转换器已经关闭且可能永远不会使用
@@ -67,6 +70,7 @@ wsFrame.noContinuation=当需要延续帧时启动了新消息。
wsFrame.notMasked=客户端帧未被屏蔽，但必须屏蔽所有客户端帧
wsFrame.oneByteCloseCode=客户端发送了一个包含无效单字节有效负载的关闭帧。
wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode
[{2}], payload 长度 [{3}]
+wsFrame.payloadMsbInvalid=接收到无效的WebSocket帧-非法设置了64位有效负载的最高有效位
wsFrame.readFailed=异步客户端读取失败
wsFrame.sessionClosed=无法处理客户端数据，因为会话已被关闭
wsFrame.suspendRequested=已请求暂停接收邮件。
@@ -84,6 +88,7 @@ wsRemoteEndpoint.closed=由于 WebSocket session 已关闭，消息将不会被
wsRemoteEndpoint.closedDuringMessage=因为 WebSocket session 被关闭，消息的剩余部分将不会被送达
wsRemoteEndpoint.closedOutputStream=由于OutputStream已关闭，不应该调用此方法。
wsRemoteEndpoint.closedWriter=此方法不能调用，因为编写器已关闭。
+wsRemoteEndpoint.encoderDestoryFailed=未能销毁[{0}]类型的编码器
wsRemoteEndpoint.flushOnCloseFailed=会话关闭后仍然启用批处理消息。无法刷新剩余的批量消息
wsRemoteEndpoint.invalidEncoder=无法实例化类型为[{0}]的指定编码器
wsRemoteEndpoint.noEncoder=没有为类 [{0}] 的对象指定编码器
@@ -101,6 +106,7 @@ wsSession.duplicateHandlerBinary=已配置二进制消息处理程序
wsSession.duplicateHandlerPong=已经配置了pong消息处理器
wsSession.duplicateHandlerText=已配置文本消息处理器
wsSession.flushFailOnClose=会话关闭时刷新批处理邮件失败
+wsSession.instanceCreateFailed=Endpoint实例创建失败
wsSession.instanceNew=endpoint 实例注册失败
wsSession.invalidHandlerTypePong=一个pong消息处理程序必须实现MessageHandler.Whole
wsSession.messageFailed=无法写入完整消息，因为WebSocket连接已关闭
@@ -114,6 +120,7 @@ wsSession.unknownHandlerType=无法添加消息处理程序[{0}]，因为它被
wsWebSocketContainer.asynchronousSocketChannelFail=无法打开与服务器的连接
wsWebSocketContainer.connect.entry=连接[{0}]类型的终端实例至[{1}]
+wsWebSocketContainer.connect.write=从本地地址[{2}]以[{1}]的限制从[{0}]开始从缓冲区写入HTTP升级请求
wsWebSocketContainer.defaultConfiguratorFail=无法创建默认配置程序。
wsWebSocketContainer.failedAuthentication=无法处理http响应代码[{0}]。服务器不接受身份验证头。
wsWebSocketContainer.httpRequestFailed=启动WebSocket连接的HTTP请求失败
diff --git
a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
index ae9909b..fed5aaa 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
@@ -22,6 +22,8 @@ pojoEndpointBase.onOpenFail=无法为类型为[{0}]的POJO调用POJO端点的onO
pojoMessageHandlerWhole.decodeIoFail=解码消息时出现IO错误
pojoMessageHandlerWhole.maxBufferSize=此实现支持的最大消息大小为Integer.MAX_VALUE
+pojoMessageHandlerWholeBase.decodeDestoryFailed=未能销毁[{0}]类型的解码器
+
pojoMethodMapping.decodePathParamFail=未能将路径参数值[{0}]解码为预期的类型[{1}]
pojoMethodMapping.duplicateAnnotation=类[{1}]上存在的重复注释[{0}]
pojoMethodMapping.duplicateLastParam=用OnMessage注释的类[{1}]的方法[{0}]上存在多个布尔参数（最后的）
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1356ee5..44760c6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ Improvements to Chinese translations contributed by ZhangJieWen and
+ chengzheyan. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.0-M2 (markt)" rtext="2021-07-02">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
