[tomcat] branch master updated: Remove new lines at start (not present in English version)

[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


The following commit(s) were added to refs/heads/master by this push:
     new 1881e6e  Remove new lines at start (not present in English version)
1881e6e is described below

commit 1881e6e03acf054d9823786505b563e01a35215e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 7 10:22:00 2019 +0100

    Remove new lines at start (not present in English version)
---
 java/org/apache/catalina/filters/LocalStrings_zh_CN.properties | 3 +--
 java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
index be687e8..da734b1 100644
--- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
@@ -28,8 +28,7 @@ expiresFilter.useMatchingConfiguration=对内容类型[{2}]返回[{3}]使用[{0}
 
 http.403=禁止访问指定资源 [{0}] 。
 
-httpHeaderSecurityFilter.clickjack.invalid=\n\
-\ 为防咔嗒顶部标题指定了无效值[{0}]
+httpHeaderSecurityFilter.clickjack.invalid=为防咔嗒顶部标题指定了无效值[{0}]
 
 remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
 
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 7dac4bc..0185971 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -99,8 +99,7 @@ jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
 jsp.error.tag.conflict.language=标签指令：非法出现多次出现的具有不同值的“语言”（旧：[{0}]，新：[{1}]）
 jsp.error.tag.invalid.trimdirectivewhitespaces=TAG指令：trimDirectiveWhitespaces的值无效
-jsp.error.tagfile.nameFrom.badAttribute=\n\
-\ 属性指令（在行[{1}]中声明并且其name属性为[{0}]，此name-from-attribute属性的值）必须是java.lang.String类型，是“required”而不是一个“rtexprvalue”。
+jsp.error.tagfile.nameFrom.badAttribute=属性指令（在行[{1}]中声明并且其name属性为[{0}]，此name-from-attribute属性的值）必须是java.lang.String类型，是“required”而不是一个“rtexprvalue”。
 jsp.error.tagfile.nameFrom.noAttribute=找不到具有值[{0}]的name属性的属性指令，该属性是name-from-attribute属性的值。
 jsp.error.taglibDirective.absUriCannotBeResolved=无法在web.xml或使用此应用程序部署的jar文件中解析绝对uri：[{0}]
 jsp.error.taglibDirective.missing.location='uri'和'tagdir' 属性均未指定。
@@ -116,8 +115,7 @@ jsp.error.unable.renameClassFile=无法重命名类文件[{0}]为[{1}]
 jsp.error.unable.to_find_method=不能为属性:[{0}]找到setter 方法.
 jsp.error.unavailable=JSP已被标记为不可用
 jsp.error.unbalanced.endtag=结束标签&lt;/{0}不对称
-jsp.error.unknown_attribute_type=\n\
-\ 属性[{0}]的未知属性类型[{1}]。
+jsp.error.unknown_attribute_type=属性[{0}]的未知属性类型[{1}]。
 jsp.error.unsupported.encoding=不支持的编码：[{0}]
 jsp.error.variable.either.name=必须在变量指令中指定 name-given 或 name-from-attribute 属性
 jsp.error.xml.badStandardAction=无效、标准的action: [{0}]


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