[tomcat] 05/05: Update Chinese translations

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit c01057b833ef834327ef577a7686b832bcedc9e5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:40:04 2021 +0000

    Update Chinese translations
---
 java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties  | 3 +++
 webapps/docs/changelog.xml                                     | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index fc09078..0b31b7c 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -20,6 +20,7 @@ dataSourceStore.checkConnectionSQLException=发生 SQL 异常 [{0}]
 dataSourceStore.close=关闭数据库连接[{0}]时发生异常
 dataSourceStore.commitSQLException=关闭前提交连接的SQLException
 dataSourceStore.loading=正在从数据库[{1}]加载会话[{0}]
+dataSourceStore.missingDataSource=没有可用的数据源
 dataSourceStore.missingDataSourceName=没有给出有效的 JNDI 名称。
 dataSourceStore.removing=正在删除数据库{1}上的会话{0}]
 dataSourceStore.saving=保存Session [{0}] 到数据库 [{1}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 159c72e..b5c32c8 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -154,6 +154,9 @@ socket.apr.write.error=将数据写入APR/native socket[{1}]时出现意外错
 socket.closed=与此连接关联的套接字已关闭。
 socket.sslreneg=重新协商SSL连接时出现异常
 
+socketWrapper.readTimeout=读取超时
+socketWrapper.writeTimeout=写入超时
+
 sslHostConfig.certificate.notype=指定了多个证书，并且至少有一个证书缺少必需的属性类型
 sslHostConfig.certificateVerificationInvalid=证书认证值[{0}]未识别
 sslHostConfig.fileNotFound=配置文件 [{0}] 不存在
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 26b448a..eb17437 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -220,7 +220,8 @@
   <subsection name="Other">
     <changelog>
       <add>
-        Improvements to Chinese translations. Provided by leeyazhou. (markt)
+        Improvements to Chinese translations. Provided by leeyazhou and Yi Shen.
+        (markt)
       </add>
       <add>
         Improvements to French translations. (remm)


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