This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e6c61f4b086764f50cb12673511a7c96fcac459d Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon May 4 16:38:22 2020 +0100 Correct previous back-port of Chinese translations --- .../apache/catalina/manager/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 - .../apache/jasper/resources/LocalStrings_zh_CN.properties | 12 ++++-------- .../org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 -- 4 files changed, 4 insertions(+), 12 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 be93cce..eabfb55 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 906955c..054cfe4 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -353,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\ @@ -369,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