You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/29 16:49:59 UTC
[tomcat] branch 8.5.x updated (103347f -> e7a6001)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 103347f Don't swallow I/O exceptions when Manager tries to find a session
new cdd150a Back-port updates to English strings
new e7a6001 Expand and update Chinese strings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/core/LocalStrings.properties | 14 +++++++-------
.../factory/webservices}/LocalStrings_zh_CN.properties | 2 +-
.../util/codec/binary}/LocalStrings_zh_CN.properties | 5 ++++-
.../util/descriptor/tld}/LocalStrings_zh_CN.properties | 2 +-
.../net/openssl/ciphers}/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml | 5 +++++
6 files changed, 19 insertions(+), 11 deletions(-)
copy java/org/apache/{tomcat/util/modeler => naming/factory/webservices}/LocalStrings_zh_CN.properties (93%)
copy java/org/apache/{catalina/ha/authenticator => tomcat/util/codec/binary}/LocalStrings_zh_CN.properties (74%)
copy java/org/apache/{catalina/valves/rewrite => tomcat/util/descriptor/tld}/LocalStrings_zh_CN.properties (91%)
copy java/org/apache/{catalina/valves/rewrite => tomcat/util/net/openssl/ciphers}/LocalStrings_zh_CN.properties (93%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Expand and update Chinese strings
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Back-port updates to English strings
Posted by ma...@apache.org.
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 cdd150ade400ab2841c36108d32252ea3c7a89cd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 29 17:46:37 2020 +0100
Back-port updates to English strings
---
java/org/apache/catalina/core/LocalStrings.properties | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 2b84fa8..720b7e8 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -69,10 +69,10 @@ applicationServletRegistration.setServletSecurity.ise=Security constraints can''
applicationSessionCookieConfig.ise=Property [{0}] cannot be added to SessionCookieConfig for context [{1}] as the context has been initialised
-aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native library
-aprListener.aprInit=The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: [{0}]
-aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not be found using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
-aprListener.aprInitError=The APR based Apache Tomcat Native library failed to load. The error reported was [{0}]
+aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
+aprListener.aprInit=The Apache Tomcat Native library which allows using OpenSSL was not found on the java.library.path: [{0}]
+aprListener.aprInitDebug=The Apache Tomcat Native library could not be found using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
+aprListener.aprInitError=The Apache Tomcat Native library failed to load. The error reported was [{0}]
aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], useOpenSSL [{1}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force entering FIPS mode, but library is already in FIPS mode [{0}]
@@ -84,9 +84,9 @@ aprListener.initializingFIPS=Initializing FIPS mode...
aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require the library to already be in FIPS mode, but it was not in FIPS mode
aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS initialization.
aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [{1}]
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using APR version [{1}].
-aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat Native library is installed, while Tomcat recommends a minimum version of [{1}]
+aprListener.tcnInvalid=An incompatible version [{0}] of the Apache Tomcat Native library is installed, while Tomcat requires version [{1}]
+aprListener.tcnValid=Loaded Apache Tomcat Native library [{0}] using APR version [{1}].
+aprListener.tcnVersion=An older version [{0}] of the Apache Tomcat Native library is installed, while Tomcat recommends a minimum version of [{1}]
aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been initialized
aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been initialized
aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already been initialized
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org