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 800a59cec2 Improvements to Chinese translations by fangzheng.
800a59cec2 is described below
commit 800a59cec2533518879df88f135ee1078d266641
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jun 28 16:29:29 2024 +0100
Improvements to Chinese translations by fangzheng.
---
.../apache/catalina/core/LocalStrings_zh_CN.properties | 6 ++++--
.../catalina/ha/session/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 3 ++-
.../apache/catalina/util/LocalStrings_zh_CN.properties | 2 ++
.../apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
.../apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 1 +
.../util/http/parser/LocalStrings_zh_CN.properties | 1 +
.../util/net/openssl/LocalStrings_zh_CN.properties | 1 -
.../net/openssl/panama/LocalStrings_zh_CN.properties | 16 ++++++++++++++++
webapps/docs/changelog.xml | 3 +++
10 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 673d88d976..a9061e7c06 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -47,8 +47,7 @@ applicationDispatcher.forward.ise=提交响应后无法转发
applicationDispatcher.isUnavailable=Servlet[{0}]当前不可用
applicationDispatcher.serviceException=Servlet[{0}]的Servlet.service()抛出异常
applicationDispatcher.specViolation.request=原始ServletRequest或包装的原始ServletRequest未传递给RequestDispatcher，这违反了SRV.8.2和SRV.14.2.5.1
-applicationDispatcher.specViolation.response=原始的ServletResponse或包装后的ServletResponse未传递给RequestDispatcher，原因：违反了SRV.8.2和SRV.14.2.5.1\n\
-\n
+applicationDispatcher.specViolation.response=原始的ServletResponse或包装后的ServletResponse未传递给RequestDispatcher，原因：违反了SRV.8.2和SRV.14.2.5.1
applicationFilterConfig.jmxRegisterFail=类型为[{0}]且名称为[{1}]的筛选器的JMX注册失败
applicationFilterConfig.jmxUnregister=已完成对类型为[{0}]且名称为[{1}]的筛选器的JMX取消注册。
@@ -158,6 +157,9 @@ naming.wsdlFailed=未找到 wsdl 文件：[{0}]
noPluggabilityServletContext.notAllowed=Servlet
3.0规范的第4.4节不允许从未在web.xml，web-fragment.xml文件中定义或未用@WebListener注释的ServletContextListener调用此方法。
+openssllistener.initializeFIPSFailed=无法进入FIPS模式
+openssllistener.sslInit=OpenSSL初始化失败
+
propertiesRoleMappingListener.roleMappingFileEmpty=角色映射文件不能为空
propertiesRoleMappingListener.roleMappingFileFail=加载角色映射文件[{0}]失败
propertiesRoleMappingListener.roleMappingFileNull=角色映射文件不能为NULL
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 182d27e82b..3c9428468d 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -30,7 +30,7 @@
deltaManager.createMessage.unableCreateDeltaRequest=无法序列化sessionid[{0}
deltaManager.createSession.newSession=用id[{0}]创建一个扩展会话(DeltaSession)，总数为 [{1}]
deltaManager.dropMessage=管理器[{0}]：将消息[{1}]放入GET_所有会话同步阶段开始日期[{2}]消息日期[{3}]。
deltaManager.expireSessions=管理器[{0}]关闭时使会话过期
-deltaManager.foundMasterMember=复制主master成员[{1}]在上下文[{0}]中被发现.\n
+deltaManager.foundMasterMember=复制主成员[{1}]在上下文[{0}]中被发现.
deltaManager.loading.cnfe=加载持久化会话 [{0}] 时出现ClassNotFoundException
deltaManager.loading.existing.session=重载现有会话[{0}]。
deltaManager.loading.ioe=加载持久 session 时出现 IOException：[{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 02dc6b8db5..27cd2f0c7d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -51,7 +51,7 @@ htmlManagerServlet.connectorStateThreadCount=当前线程数：
htmlManagerServlet.deployButton=部署
htmlManagerServlet.deployConfig=XML配置文件路径：
htmlManagerServlet.deployPath=Context路径：
-htmlManagerServlet.deployServer=服务器上.部署的目录或WAR文件
+htmlManagerServlet.deployServer=服务器上的部署目录或WAR文件
htmlManagerServlet.deployTitle=部署
htmlManagerServlet.deployUpload=要部署的WAR文件
htmlManagerServlet.deployUploadFail=失败 - 部署上传失败，异常信息：[{0}]
@@ -127,6 +127,7 @@ managerServlet.deployed=OK - 以应用path [{0}] 部署应用
managerServlet.deployedButNotStarted=失败 - 在上下文[{0}]下部署应用程序，但是上下文启动失败。
managerServlet.error.deploy=部署[{0}]错误
managerServlet.error.idleParam=无法解析闲置整数参数[{0}]
+managerServlet.error.jmx=JMX错误
managerServlet.error.reload=重新加载[{0}]错误
managerServlet.error.resources=显示类型[{0}]的资源错误
managerServlet.error.serverInfo=显示服务器信息错误
diff --git a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
index 861269c1bd..52b6532f56 100644
--- a/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
@@ -48,3 +48,5 @@ sessionIdGeneratorBase.noSHA1PRNG=此 JVM 不支持 SecureRandom 的默认
SHA1P
sessionIdGeneratorBase.random=初始化类[{0}]的随机数生成器时发生异常。回到java.secure.SecureRandom
sessionIdGeneratorBase.randomAlgorithm=使用算法[{0}]初始化随机数生成器时发生异常
sessionIdGeneratorBase.randomProvider=使用程序提供的初始化随机数生成器异常[{0}]
+
+timebucket.maintenance.error=定期维护时出现错误
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 622d0c8954..3a130b6956 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -72,7 +72,7 @@ http2Parser.processFrameData.window=连接[{0}]，客户端发送的数据比流
http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然保留 - 它本应该被消费掉
http2Parser.processFrameHeaders.decodingFailed=对HTTP头进行HPACK解码时出错
http2Parser.processFrameHeaders.payload=连接：[{0}]，流：[{1}]，正在处理[{1}]大小的头文件负载
-http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符
+http2Parser.processFramePushPromise=连接 [{0}]，流 [{1}]，PUSH_PROMISE帧不应由客户端发送
http2Parser.processFrameSettings.ackWithNonZeroPayload=接收到带有ACK标志设置和有效负载的设置帧
http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小增量[{2}]
http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[0]
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index 7434a083dc..6844987f84 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -28,6 +28,7 @@ hexUtils.fromHex.nonHex=输入只能由十六进制数字组成
hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成
uDecoder.eof=文件结尾（EOF）
+uDecoder.isHexDigit=十六进制编码无效
uDecoder.noSlash=不允许使用编码的斜杠字符
uDecoder.urlDecode.conversionError=使用编码[{1}]解码[{0}]失败
uDecoder.urlDecode.missingDigit=无法解码[{0}]，因为%字符必须后跟两个十六进制数字。
diff --git
a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
index 42a5fa114c..b28c70cd4f 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
@@ -50,6 +50,7 @@ sf.boolean.invalidCharacter=[{0}]字符不是有效布尔值
sf.invalidCharacter=[{0}]字符在这里无效
sf.numeric.decimalInvalidFinal=十进制最后一个字符必须是数字
sf.numeric.decimalPartTooLong=小数点后超过3位
+sf.numeric.decimalTooLong=小数位数超过了16个字符
sf.numeric.integerTooLong=一个整数中发现超过15位数字
sf.string.invalidCharacter=字符串中[{0}]字符无效
sf.string.invalidEscape=[{0}]字符不能被转义
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 44f6798388..63300f7105 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
@@ -12,7 +12,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
engine.ciphersFailure=获取密码列表失败
engine.emptyCipherSuite=空密码套件
engine.engineClosed=引擎已经关闭
diff --git
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000..a8f6460f0b
--- /dev/null
+++
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+engine.noSession=SSL会话ID不可用
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d4e57ae5f7..bc414180ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -241,6 +241,9 @@
<add>
Improvements to Japanese translations by tak7iji. (markt)
</add>
+ <add>
+ Improvements to Chinese translations by fangzheng. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
