[tomcat] 06/06: Backport updates to Chinese translations

2022-03-29 Thread markt
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 
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
+++ 

[tomcat] 06/06: Backport updates to Chinese translations

2020-05-04 Thread markt
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 1b75434a8e0137107436d5deef8338a50437ad76
Author: Mark Thomas 
AuthorDate: Mon May 4 17:53:35 2020 +0100

Backport updates to Chinese translations
---
 java/javax/el/LocalStrings_zh_CN.properties|   1 +
 java/javax/servlet/LocalStrings_zh_CN.properties   |   1 +
 .../servlet/http/LocalStrings_zh_CN.properties |   2 +
 .../authenticator/LocalStrings_zh_CN.properties|  16 +++
 .../connector/LocalStrings_zh_CN.properties|  24 +
 .../catalina/core/LocalStrings_zh_CN.properties| 105 +-
 .../catalina/deploy/LocalStrings_zh_CN.properties  |   3 +
 .../catalina/filters/LocalStrings_zh_CN.properties |  19 
 .../ha/deploy/LocalStrings_zh_CN.properties|  19 
 .../ha/session/LocalStrings_zh_CN.properties   |  28 +
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  10 ++
 .../catalina/loader/LocalStrings_zh_CN.properties  |  20 
 .../catalina/manager/LocalStrings_zh_CN.properties |   3 +-
 .../manager/host/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |  35 ++
 .../security/LocalStrings_zh_CN.properties |   6 ++
 .../servlets/LocalStrings_zh_CN.properties |  19 
 .../catalina/session/LocalStrings_zh_CN.properties |  27 -
 .../catalina/startup/LocalStrings_zh_CN.properties |  59 +++---
 .../interceptors/LocalStrings_zh_CN.properties |   3 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |   1 +
 .../tribes/util}/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/users/LocalStrings_zh_CN.properties   |   3 +
 .../catalina/util/LocalStrings_zh_CN.properties|  15 +++
 .../catalina/valves/LocalStrings_zh_CN.properties  |  39 +++
 .../apache/coyote/LocalStrings_zh_CN.properties|   5 +
 .../coyote/ajp/LocalStrings_zh_CN.properties   |   4 +
 .../coyote/http11/LocalStrings_zh_CN.properties|   8 ++
 .../http11/filters/LocalStrings_zh_CN.properties   |   2 +
 .../http11/upgrade/LocalStrings_zh_CN.properties   |   4 +
 .../jasper/resources/LocalStrings_zh_CN.properties | 119 +++--
 .../apache/naming/LocalStrings_zh_CN.properties|   5 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   7 ++
 .../webservices}/LocalStrings_zh_CN.properties |   2 +-
 .../tomcat/util/LocalStrings_zh_CN.properties  |   5 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |   5 +
 .../util/descriptor/LocalStrings_zh_CN.properties  |   5 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |   4 +
 .../util/http/parser/LocalStrings_zh_CN.properties |   3 +
 .../util/modeler/LocalStrings_zh_CN.properties |   1 +
 .../tomcat/util/scan/LocalStrings_zh_CN.properties |   2 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  40 +++
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  10 ++
 .../websocket/server/LocalStrings_zh_CN.properties |   6 ++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |   3 +
 45 files changed, 673 insertions(+), 29 deletions(-)

diff --git a/java/javax/el/LocalStrings_zh_CN.properties 
b/java/javax/el/LocalStrings_zh_CN.properties
index 1803a07..b2b2585 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 expressionFactory.cannotCreate=无法创建类型为[{0}]的表达式工厂
+expressionFactory.cannotFind=找不到类型为[{0}]的ExpressionFactory
 expressionFactory.readFailed=无法读取[{0}]
 
 objectNotAssignable=无法将类型为[{0}]的对象添加到[{1}]类型的对象数组中
diff --git a/java/javax/servlet/LocalStrings_zh_CN.properties 
b/java/javax/servlet/LocalStrings_zh_CN.properties
index 7fc4358..60310f3 100644
--- a/java/javax/servlet/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/LocalStrings_zh_CN.properties
@@ -19,4 +19,5 @@ httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
 
 httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
 
+value.false=否
 value.true=true
diff --git a/java/javax/servlet/http/LocalStrings_zh_CN.properties 
b/java/javax/servlet/http/LocalStrings_zh_CN.properties
index fbbd569..8a3b99e 100644
--- a/java/javax/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/http/LocalStrings_zh_CN.properties
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 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=短.读
 
diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 69fd28a..0dc5906 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@