This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96fbaf76106d5308dd7c686679776b45a2d2f9d8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Dec 6 10:22:55 2019 +0000 Back-port updates to the Chinese translations from 8,5,x --- java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 1 + java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 + java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 4 ++++ 10 files changed, 13 insertions(+) diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties index f65f96a..c3e7dd8 100644 --- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +farmWarDeployer.deleteFail=无法删除 [{0}] farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效 farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名 farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}] diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties index ef59200..9290c3f 100644 --- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties @@ -21,6 +21,7 @@ dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常 jaasCallback.username=返回用户名 [{0}] +jaasRealm.authenticateFailure=用户 [{0}] 认证失败 jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建 jaasRealm.failedLogin=由于登录失败,用户名 [{0}] 无法授权 jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}] diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties index a98f87e..30cda59 100644 --- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties @@ -41,6 +41,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常 standardManager.unloading.nosessions=没有要卸载的持久会话 standardSession.attributeEvent=会话属性事件侦听器引发异常 +standardSession.getAttribute.ise=getAttribute: 会话已失效 standardSession.getAttributeNames.ise=getAttributeNames:会话已失效 standardSession.getCreationTime.ise=getCreataionTime:会话已经无效 standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效 diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties index 9e4b10e..d85303d 100644 --- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties @@ -77,6 +77,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错 hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成 hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase [{0}],将被忽略 hostConfig.deployDir=把web 应用程序部署到目录 [{0}] +hostConfig.deployDir.error=无法部署应用目录 [{0}] hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错 hostConfig.deployWar.hiddenDir=将忽略目录[{0}],因为WAR [{1}]优先,unpackWAR为false hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错 diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties index 08f8e26..084f291 100644 --- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties @@ -83,6 +83,7 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。 remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。 +remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}] remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效 requestFilterValve.configInvalid=为Remote [Addr | Host]阀门提供了一个或多个无效配置设置,阻止Valve及其父容器启动 diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties index 3f61189..cf485d2 100644 --- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties @@ -17,6 +17,7 @@ http11processor.header.parse=解析 HTTP 请求 header 错误 http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。 http11processor.request.invalidScheme=HTTP请求包含具有无效方案的绝对URL http11processor.request.invalidUserInfo=HTTP 请求包含带有无效 userinfo 的绝对 URI +http11processor.request.multipleContentLength=请求包含了多个content-length请求头参数 http11processor.request.noHostHeader=http/1.1请求没有提供主机头 http11processor.request.prepare=准备请求时出错 http11processor.request.process=错误的处理请求 diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties index b53ea12..acc1fd0 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -144,6 +144,7 @@ jsp.warning.dumpSmap=警告:初始化堆内存的值无效。将使用“false jsp.warning.enablePooling=警告:initParam enablePooling的值无效。将使用默认值“true” jsp.warning.fork=警告:initParam的值无效。将使用“true”的默认值 jsp.warning.noJarScanner=警告:ServletContext中没有设置org.apache.tomcat.JarScaner。回到默认的JarScaner实现。 +jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false” jspc.delete.fail=无法删除文件 [{0}] jspc.error.fileDoesNotExist=文件参数 [{0}] 不存在 diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties index 336605c..9c14260 100644 --- a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties @@ -22,6 +22,7 @@ http.invalidLeadingZero=非零的IPv4字符可能不包含前导零。 http.invalidOctet=无效字符[{0}].IPv4字符的有效范围为0~255。 http.invalidSegmentEndState=状态[{0}]对于段的结尾无效。 http.noClosingBracket=ipv6 地址缺失一个闭合的圆括号 +http.noOpeningBracket=IPv6地址缺少开括号( http.singleColonEnd=IPv6地址不能以单个“.”结尾。 http.singleColonStart=一个IPv6地址也许不是以单个冒号":"开头的。 http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。 diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties index b36519e..4b74f50 100644 --- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties @@ -14,6 +14,7 @@ # limitations under the License. pojoEndpointBase.onCloseFail=):无法为类型为[{0}]的POJO调用POJO端点的onClose方法 +pojoEndpointBase.onError=在错误发生后,没有为[{0}]配置错误处理 pojoEndpointBase.onOpenFail=无法为类型为[{0}]的POJO调用POJO端点的onOpen方法 pojoEndpointServer.getPojoInstanceFail=创建类型为 [{0}] 的 POJO 实例失败 diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ffac708..50fefa6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -149,6 +149,10 @@ Expand the coverage of the Korean translations provided with Apache Tomcat. (woonsan) </add> + <add> + Expand the coverage of the Chinese translations provided with Apache + Tomcat. Contributions provided by lins and 磊. (markt) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org