This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e7a6001404e777a249d91081966cdf2e83725293 Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Apr 29 17:49:30 2020 +0100 Expand and update Chinese strings --- .../factory/webservices/LocalStrings_zh_CN.properties | 16 ++++++++++++++++ .../util/codec/binary/LocalStrings_zh_CN.properties | 19 +++++++++++++++++++ .../util/descriptor/tld/LocalStrings_zh_CN.properties | 16 ++++++++++++++++ .../net/openssl/ciphers/LocalStrings_zh_CN.properties | 16 ++++++++++++++++ webapps/docs/changelog.xml | 5 +++++ 5 files changed, 72 insertions(+) diff --git a/java/org/apache/naming/factory/webservices/LocalStrings_zh_CN.properties b/java/org/apache/naming/factory/webservices/LocalStrings_zh_CN.properties new file mode 100644 index 0000000..08d3248 --- /dev/null +++ b/java/org/apache/naming/factory/webservices/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. + +serviceProxy.portNotFound=找不到端口组件ref[{0}] diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties new file mode 100644 index 0000000..0624dec --- /dev/null +++ b/java/org/apache/tomcat/util/codec/binary/LocalStrings_zh_CN.properties @@ -0,0 +1,19 @@ +# 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. + +base64.impossibleModulus=不可能的模[{0}] +base64.inputTooLarge=输入数组太大,输出数组将比指定的最大大小[{1}]大[{0}] +base64.lineSeparator=行分隔符不能包含base64个字符[{0}] +base64.nullEncodeParameter=不能用空参数编码整数 diff --git a/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/descriptor/tld/LocalStrings_zh_CN.properties new file mode 100644 index 0000000..7999008 --- /dev/null +++ b/java/org/apache/tomcat/util/descriptor/tld/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. + +implicitTldRule.elementNotAllowed=隐式.tld文件中不允许元素[{0}] diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties new file mode 100644 index 0000000..59c4c33 --- /dev/null +++ b/java/org/apache/tomcat/util/net/openssl/ciphers/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. + +converter.mapping=密码套件映射:[{0}]=>[{1}] diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4b1a44d..2dd9cf1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -167,6 +167,11 @@ Refactor bulk addition to collections to use <code>addAll()</code> rather than a loop. Pull request provided by Lars Grefer. (markt) </scode> + <add> + Expand the coverage of the Chinese translations provided with Apache + Tomcat. Contributions provided by winsonzhao, ZhangJieWen and Lee + Yazhou. (markt) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org