This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 205ef949add15e2991e7f795e35343441e725151 Author: Mark Thomas <[email protected]> AuthorDate: Tue Mar 29 23:44:34 2022 +0100 Backport updates to Chinese translations --- java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties | 1 + 5 files changed, 10 insertions(+) diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties index 0a79c8f..7ee13f9 100644 --- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +abstractStream.setConnectionAllocationMade=连接 [{0}]，流 [{1}]，连接分配从 [{2}] 更改为 [{3}] +abstractStream.setConnectionAllocationRequested=连接 [{0}]，流 [{1}]，请求的连接分配从 [{2}] 更改为 [{3}] abstractStream.windowSizeDec=连接[{0}]，流[{1}]，将流控制窗口减少[{2}]到[{3}] abstractStream.windowSizeInc=连接 [{0}], 流 [{1}], 增加流量控制窗口[{2}] 到 [{3}] abstractStream.windowSizeTooBig=连接[{0}]，流[{1}]，窗口大小从[{2}]增加到[{3}]，超过了允许的最大值 @@ -144,6 +146,7 @@ upgradeHandler.releaseBacklog=连接[{0}]，流[{1}]已从待办事项列表中 upgradeHandler.reset.receive=连接[{0}],流[{1}],由于[{2}]而重置 upgradeHandler.rst.debug=连接[{0}]，流[{1}]，错误[{2}]，消息[{3}]，RST（关闭流） upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败 +upgradeHandler.sendfile.reservation=在发送文件写入之前的连接 [{0}]、流 [{1}]、连接预留 [{2}]、流预留 [{3}] upgradeHandler.socketCloseFailed=关闭 socket 错误 upgradeHandler.startRequestBodyFrame.result=连接[{0}],流[{1}]startRequestBodyFrame返回[{2}] upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间 diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties index 77e7c64..78c43ea 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -49,6 +49,7 @@ jsp.error.cannotAddResolver=在第一次请求发生之后不能调用addELResol jsp.error.classname=无法从.class文件确定类名 jsp.error.coerce_to_type=无法将值[{2}]强制为属性[{0}]的类型[{1}]。 jsp.error.compilation=编译文件时出错：[{0}[{1}] +jsp.error.compilation.dependent=加载类[{0}]失败 jsp.error.compilation.jdt=编译错误 jsp.error.compilation.jdtProblemError=处理JDT问题列表时出错 jsp.error.compilation.source=加载源文件时出错[{0}] 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 827e4da..d759e22 100644 --- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties @@ -80,6 +80,7 @@ endpoint.debug.unlock.localFail=无法确定[{0}]的本地地址 endpoint.debug.unlock.localNone=无法解除 [{0}] 的接受器，因为本地地址不可用 endpoint.duplicateSslHostName=为主机名[{0}]提供了多个SSLHostConfig元素。主机名必须唯一 endpoint.err.close=抓住异常试图关闭socket +endpoint.err.duplicateAccept=检测到重复接收。这是一个已知的操作系统错误。请考虑报告您受到影响：https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1924298 endpoint.err.handshake=握手失败 endpoint.err.unexpected=处理套接字时意外错误 endpoint.executor.fail=执行器拒绝了用于处理的套接字[{0}] @@ -160,6 +161,7 @@ sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别 sslHostConfig.fileNotFound=配置文件 [{0}] 不存在 sslHostConfig.invalid_truststore_password=提供的信任存储密码无法用于解锁和/或验证信任存储。正在重试使用空密码访问信任存储，该密码将跳过验证。 sslHostConfig.mismatch=属性[{0}]是在名为[{1}]的SSLHostConfig 上设置的，用于[{2}]配置语法，但SSLHostConfig 正与[{3}]配置语法一起使用 +sslHostConfig.opensslconf.alreadyset=尝试设置的另一个 OpenSSLConf 被忽略\n sslHostConfig.opensslconf.null=(:忽略设置空OpenSSLConf 的尝试 sslHostConfig.prefix_missing=协议[{0}]已添加到名为[{1}]的SSLHostConfig 上的协议列表中。检查是否缺少一个+/-前缀。 diff --git a/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties index 7864aaf..bc021bb 100644 --- a/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/security/LocalStrings_zh_CN.properties @@ -14,3 +14,6 @@ # limitations under the License. concurrentMessageDigest.noDigest=摘要算法不可用 + +privilegedSetAccessControlContext.lookupFailed=无法获取对字段 Thread.inheritedAccessControlContext 的引用 +privilegedSetAccessControlContext.setFailed=无法设置字段 Thread.inheritedAccessControlContext diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties index a41b171..3b7231a 100644 --- a/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties @@ -22,6 +22,7 @@ serverContainer.missingAnnotation=无法部署POJO类[{0}]，因为它没有用@ serverContainer.servletContextMissing=没有指定ServletContext upgradeUtil.incompatibleRsv=指定扩展名具有不兼容的RSV位使用 +upgradeUtil.pojoMapFail=无法完成 POJO 类 [{0}] 的方法映射 uriTemplate.duplicateParameter=参数[{0}]在不允许的路径中出现多次 uriTemplate.emptySegment=路径[{0}]包含一个或多个不允许的空段 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
