[tomcat] 04/04: Back-port updates to Chinese translations

[markt]

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 f0976b0279f1ecd6d4409ebab58fc2fef6b48236
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 26 11:59:35 2021 +0000

    Back-port updates to Chinese translations
---
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 3 +++
 webapps/docs/changelog.xml                                    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 00a8524..08ab3df 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -131,6 +131,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 88d3b8e..5f2734d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -209,7 +209,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org