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 8728499 Remove empty strings created by incorrect import
8728499 is described below
commit 872849915c6dec97c2a6ea8d95f0f616490bfabe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 1 10:25:51 2020 +0100
Remove empty strings created by incorrect import
---
.../catalina/manager/LocalStrings_zh_CN.properties | 1 -
.../apache/catalina/realm/LocalStrings_zh_CN.properties | 1 -
.../jasper/resources/LocalStrings_zh_CN.properties | 16 ++++------------
.../apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 --
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 4969790..5258288 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -163,7 +163,6 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
managerServlet.saved=OK - 服务器配置已保存
managerServlet.savedContext=OK - 上下文[{0}]配置已保存
-managerServlet.savedContextFail=
managerServlet.serverInfo=OK - 服务器信息\n\
Tomcat版本: [{0}]\n\
操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 860b043..36c5f22 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -20,7 +20,6 @@ combinedRealm.authSuccess=认证用户[{0}]，权限[{1}]
combinedRealm.getPassword=永远不应该调用getPassword（）方法
combinedRealm.getPrincipal=方法getPrincipal()永远不应该被调用
combinedRealm.realmStartFail=无法启动[{0}]领域
-combinedRealm.setCredentialHandler=
combinedRealm.unexpectedMethod=对组合域上的方法进行了意外调用
credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字符串[{0}]，以便与用户提供的凭据匹配
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index efe11e9..054cfe4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -291,12 +291,9 @@ jsp.warning.mappedFile=警告：initParam mappedFile的值无效。将使用默
jsp.warning.maxLoadedJsps=警告：initParam maxLoadedJsps的值无效。将使用默认值“-1”。
jsp.warning.modificationTestInterval=警告：initParam
modificationTestInterval的值无效。将使用默认值“4”秒
jsp.warning.noJarScanner=警告：ServletContext中没有设置org.apache.tomcat.JarScaner。回到默认的JarScaner实现。
-jsp.warning.poolTagsWithExtends=
jsp.warning.quoteAttributeEL=警告：initParam quoteattribeel的值无效。将使用默认值“false”
jsp.warning.recompileOnFail=警告：initParam recompileOnFail的值无效。将使用默认值“false”
-jsp.warning.strictGetProperty=
jsp.warning.strictQuoteEscaping=警告：对initParam
strictQuoteEscaping来说无效的值，将会使用默认值“true”
-jsp.warning.strictWhitespace=
jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false”
jsp.warning.tagPreDestroy=处理标记实例的preDestroy时出错[{0}]
jsp.warning.tagRelease=处理[{0}]的标记实例上的释放时出错
@@ -304,7 +301,6 @@ jsp.warning.unknown.sourceVM=忽略未知源VM[{0}]
jsp.warning.unknown.targetVM=忽略未知目标VM[{0}]
jsp.warning.unsupported.sourceVM=不支持的源VM[{0}]请求，使用[{1}]
jsp.warning.unsupported.targetVM=不支持请求的目标VM[{0}]，使用[{1}]
-jsp.warning.useInstanceManagerForTags=
jsp.warning.xpoweredBy=警告：initParam xpoweredBy的值无效。将使用默认值“false”
jspc.delete.fail=无法删除文件 [{0}]
@@ -357,8 +353,7 @@ jsp.文件在哪\n\
\ -threadCount <count> 编译使用的线程数.\n\
\ ("2.0C" 意味着每个内核有两个线程)\n
jspc.warning.tldInWebInfLib=TLD文件不应放在/WEB-INF/lib中”
-jspc.webfrg.footer=\n\
-</web-fragment>\n\
+jspc.webfrg.footer=</web-fragment>\n\
\n
jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
@@ -373,20 +368,17 @@ jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
由 Apache Tomcat JspC 自动生成。\n\
-->\n\
\n
-jspc.webinc.footer=\n\
-<!--\n\
+jspc.webinc.footer=<!--\n\
由Apache Tomcat JSPC自动创建的内容结束。\n\
-->\n\
\n
-jspc.webinc.header=\n\
-<!--\n\
+jspc.webinc.header=<!--\n\
由 Apache Tomcat JspC 自动生成。\n\
-->\n\
\n
jspc.webinc.insertEnd=<!-- JSPC servlet 映射结束 -->
jspc.webinc.insertStart=<!-- JSPC servlet 映射开始 -->
-jspc.webxml.footer=\n\
-</web-app>\n\
+jspc.webxml.footer=</web-app>\n\
\n
jspc.webxml.header=<?xml version="1.0" encoding="{0}"?>\n\
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index ede140a..1a61c77 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -22,8 +22,6 @@ byteBufferUtils.cleaner=无法使用直接ByteBuffer清洁剂，可能会发生
chunk.overflow=缓冲区溢出且未设置接收器，请限制[{0}]和缓冲区长度[{1}]
-encodedSolidusHandling.invalid=
-
hexUtils.fromHex.nonHex=输入只能由十六进制数字组成
hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
