[tomcat] branch 8.5.x updated: Fix PR #211 via POEditor

[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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 7b841fa  Fix PR #211 via POEditor
7b841fa is described below

commit 7b841fabe63af1fd3a3834128a132471e63e0a49
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 6 12:50:03 2019 +0000

    Fix PR #211 via POEditor
---
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 7 ++++---
 webapps/docs/changelog.xml                                     | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index d4b0bff..956688b 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -20,7 +20,7 @@ corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
 corsFilter.wrongType1=期望类型为[{0}]的HttpServletRequest对象
 corsFilter.wrongType2=期望类型为[{0}]或[{1}]的HttpServletRequest对象
 
-csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
+csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源。
 
 expiresFilter.invalidDurationNumber=指令[{1}]中的持续时间（数字）[{0}]无效
 expiresFilter.noDurationFound=在指令[{0}]中找不到持续时间
@@ -37,9 +37,10 @@ filterbase.noSuchProperty=未为[{1}]类型的筛选器定义属性[{0}]
 
 http.403=禁止访问指定资源 [{0}] 。
 
-httpHeaderSecurityFilter.clickjack.invalid=为防咔嗒顶部标题指定了无效值[{0}]
+httpHeaderSecurityFilter.clickjack.invalid=为防点击挟持的响应消息头指定了非法值 [{0}]
+httpHeaderSecurityFilter.committed=在进入HttpHeaderSecurityFilter的时候响应消息已经提交导致不能添加响应消息头
 
-remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
+remoteCidrFilter.noRemoteIp=客户端没有 IP 地址，请求被拒绝。
 
 remoteIpFilter.invalidHostHeader=HTTP头 [{1}]中，为Host找到一个无效值 [{0}]
 remoteIpFilter.invalidHostWithPort=HTTP头 [{1}]中的Host值 [{0}]包含一个被忽略的端口号
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aa2ac78..0b50e22 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -158,8 +158,8 @@
       <add>
         Expand the coverage and quality of the Simplified Chinese translations
         provided with Apache Tomcat. Contributions provided by rpo130, Mason
-        Shen, leeyazhou, winsonzhao, qingshi huang, Lay and Shucheng Hou.
-        (markt)
+        Shen, leeyazhou, winsonzhao, qingshi huang, Lay, Shucheng Hou and
+        Yanming Zhou. (markt)
       </add>
     </changelog>
   </subsection>


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