[tomcat] branch main updated: Improvements to Chinese translations.

[ma...@apache.org]

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 d2b1927  Improvements to Chinese translations.
d2b1927 is described below

commit d2b19276ea9f3781a849b36fc58a8f143f92154d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 2 20:56:31 2021 +0100

    Improvements to Chinese translations.
---
 .../catalina/loader/LocalStrings_zh_CN.properties  |  1 -
 .../interceptors/LocalStrings_zh_CN.properties     |  3 +--
 java/org/apache/el/LocalStrings_zh_CN.properties   | 25 ++++++++++++++++++++++
 webapps/docs/changelog.xml                         |  4 ++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 8ecd37d..8874fbb 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -15,7 +15,6 @@
 
 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}]获取规范文件路径
 webappClassLoader.addPermissionNoProtocol=不支持URL[{1}]中的协议[{0}]，因此未授予位于此URL的资源的读取权限
 webappClassLoader.addTransformer=将类文件转换器[{0}]添加到Web应用程序[{1}]。
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 8fd3f13..78e2cc7 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -97,8 +97,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
 \    错误消息：{6}\n\
 \    接收消息：{7} 消息数\n\
 \    接收速率：{8} MB/秒（从第一个消息开始）\n\
-\    收到：{9}MB]\n\
-\n
+\    收到：{9}MB]\n
 
 twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
 twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
diff --git a/java/org/apache/el/LocalStrings_zh_CN.properties b/java/org/apache/el/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000..9518411
--- /dev/null
+++ b/java/org/apache/el/LocalStrings_zh_CN.properties
@@ -0,0 +1,25 @@
+# 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.
+
+error.cannotSetVariables=不能在工厂上设置变量
+error.context.null=ELConect为空
+error.method.nullParms=参数类型不能为null
+error.noVariableMapperTarget=VariableMapper目标不能为空
+error.null=表达式不能为null
+error.nullLocalName=本地名称不能为null
+error.nullMethod=方法不能为null
+error.value.expectedType=预期的类型不能为null
+
+stream.compare.notComparable=Stream中的元素必须实现了Comparable接口
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2377fd3..645a0f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -249,6 +249,10 @@
         Switch to the CDN as the primary download location for ASF dependencies.
         (markt)
       </update>
+      <add>
+        Improvements to Chinese translations contributed by syseal, wolibo and
+        ZhangJieWen. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org