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 f44ebcf Update Chinese translations.
f44ebcf is described below
commit f44ebcf13239436a16b2cd4891cf4f7e96ec5bfc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Feb 19 14:38:52 2022 +0000
Update Chinese translations.
Contributed by cloudgyb, totoo and Chenyonghui1028
---
java/jakarta/servlet/jsp/LocalStrings_zh_CN.properties | 16 ++++++++++++++++
.../apache/catalina/core/LocalStrings_zh_CN.properties | 2 ++
.../catalina/startup/LocalStrings_zh_CN.properties | 2 +-
.../apache/catalina/valves/LocalStrings_zh_CN.properties | 2 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/http/LocalStrings_zh_CN.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
7 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/java/jakarta/servlet/jsp/LocalStrings_zh_CN.properties
b/java/jakarta/servlet/jsp/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000..d6e6266
--- /dev/null
+++ b/java/jakarta/servlet/jsp/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.
+
+el.unknown.identifier=未定义的标识符
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 1c81baa..8545cd5 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -143,6 +143,8 @@
jniLifecycleListener.missingPathOrName=必须设置libraryName或libraryPath之
jreLeakListener.classToInitializeFail=在tomcat启动期间未能加载类[{0}]，以防止可能的内存泄漏。
+listener.notServer=监听器必须嵌套在Server元素内，但是它在[{0}]
+
naming.addEnvEntry=添加环境条目 [{0}]
naming.addResourceEnvRef=添加资源环境引用 [{0}]
naming.bindFailed=无法绑定对象：[{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 66d2f18..9e35c2d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -28,7 +28,7 @@ catalina.startup=[{0}]毫秒后服务器启动
catalina.stopError=停止 Catalina 时出错
catalina.stopServer=未配置关闭端口。通过OS信号关闭服务器。服务器未关闭。
catalina.stopServer.connectException=无法联系[{0}:{1}]（基端口[{2}]和偏移量[{3}]）。Tomcat可能不在运行。
-catalina.usage=用法: java org.apache.catalina.startup.Catalina [ -config
{pathname} ] [ -nonaming ] { -help | start | stop }
+catalina.usage=用法: java org.apache.catalina.startup.Catalina [ -config
{pathname} ] [ -nonaming ] [ -generateCode [ {pathname} ] ] [ -useGeneratedCode
] { -help | start | stop }
catalinaConfigurationSource.cannotObtainURL=无法从给定的参数[{0}]处获取资源：没有可读文件，没有类加载器或者不是可解析的URI
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 15b734d..2b6663e 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -144,7 +144,7 @@ requestFilterValve.configInvalid=为Remote [Addr |
Host]阀门提供了一个或
requestFilterValve.deny=根据[{1}]配置拒绝[{0}]的请求
sslValve.certError=无法处理证书字符串[{0}]以创建java.security.cert.X509Certificate对象
-sslValve.invalidProvider=与此{[0}]请求关联的连接器上指定的SSL提供程序无效。 无法处理证书数据。
+sslValve.invalidProvider=与此[{0}]请求关联的连接器上指定的SSL提供程序无效。 无法处理证书数据。
stuckThreadDetectionValve.notifyStuckThreadCompleted=线程[{0}](id=[{3}])之前报告为卡住，但是已经完成。它活跃了大概[{1}]毫秒。{2,选择，0#|0<
仍有[{2}]个被Valve监控的线程可能卡住}
stuckThreadDetectionValve.notifyStuckThreadDetected=线程[{0}]（id=[{6}]）已处于活动状态[{1}]毫秒（自[{2}]起），以便为[{4}]提供相同的请求，并且可能被卡住（此StuckThreadDetectionValve的配置阈值为[{5}]秒）。总共有{3}个线程受此阀监视，可能被卡住。
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index cd7edd4..e0a818e 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/http/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
index cea40f5..cee2400 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
@@ -36,6 +36,8 @@ parameters.maxCountFail.fallToDebug=\n\
parameters.multipleDecodingFail=字符解码失败。总共检测到[{0}]个失败，但只记录了第一个失败。为此记录器启用调试级别日志记录以记录所有故障。
parameters.noequal=):参数从位置[{0}]开始，到位置[{1}]结束，值为[{2}]，后面没有“=”字符
+rfc6265CookieProcessor.invalidAttributeName=cookie中包含无效属性名[{0}]
+rfc6265CookieProcessor.invalidAttributeValue=cookie属性[{0}]包含无效属性值[{1}]
rfc6265CookieProcessor.invalidCharInValue=Cookie值中存在无效字符[{0}]
rfc6265CookieProcessor.invalidDomain=为此cookie指定的域[{0}]无效
rfc6265CookieProcessor.invalidPath=这个cookie被指定了一个无效的路径 [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 54a0e15..86e3d85 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -241,6 +241,10 @@
that broke the <code>DataSourceMXBean</code> by using a type that isn't
supported by MXBeans. (markt)
</fix>
+ <add>
+ Improvements to Chinese translations contributed by cloudgyb, totoo and
+ Chenyonghui1028. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
