svn commit: r1848951 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/filters/ catalina/ha/session/ catalina/servlets/ catalina/session/ catalina/tribes/membership/ catalina/tribes/transport/ catalina/util/ catalina/valves/ coyote/ coyote/ht...

[markt]

Author: markt
Date: Fri Dec 14 15:11:29 2018
New Revision: 1848951

URL: http://svn.apache.org/viewvc?rev=1848951&view=rev
Log:
Update Chinese (Simplified) translations

Added:
    
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties  
 (with props)
Modified:
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -87,6 +87,7 @@ standardHost.noContext=没有é…�
 standardHost.notContext=主机的子节点必须有上下文
 
 
standardServer.accept.timeout=在调用accept()方法之后，侦听shutdown命令的套接字经历了意外的è¶
…æ—¶[{0}]毫秒。 这是bug 56684的一个例子？
+standardServer.storeConfig.notAvailable=没有将StoreConfig实现注册为名为[{0}]的MBean，å›
 æ­¤æ— æ³•ä¿å­˜é…
ç½®ã€‚合适的MBean通常通过StoreConfigLifecycleListener注册。
 
 standardService.engine.stopFailed=失败停止关联的引擎
 

Modified: 
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -21,7 +21,9 @@ corsFilter.onlyHttp=CORS不支æŒ
 csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
 
 expiresFilter.noExpirationConfiguredForContentType=没有为 content-type 
[{0}] 找到过期配置
+expiresFilter.startingPointInvalid=在指令[{1}]中无
效的起点(访问|现在|修改|a<秒>|m<秒>)[{0}]
 expiresFilter.unsupportedStartingPoint=不支持的起始点 [{0}]
+expiresFilter.useMatchingConfiguration=对内
容类型[{2}]返回[{3}]使用[{0}]匹配[{1}]
 
 http.403=禁止访问指定资源 [{0}] 。
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -22,6 +22,7 @@ deltaManager.loading.cnfe=加载æ
 deltaManager.loading.ioe=加载持久 session 时出现 IOException：[{0}]
 deltaManager.noSessionState=管理者
[{0}]：没有收到[{1}]发送的会话状态，在[{2}]毫秒之后超时。
 deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session 
状态反序列化
+deltaManager.receiveMessage.delta.unknown=管理器[{0}]：未知会话的接收会话增量[{1}]
 deltaManager.receiveMessage.expired=管理器[{0}]: 接收到的会话 [{1}] 
已过期。
 deltaManager.receiveMessage.unloadingBegin=管理器[{0}]: 开始卸载会话
 deltaManager.sendMessage.newSession=\ 管理器 [{0}] 发送新的会话 [{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -20,6 +20,8 @@ cgiServlet.runInvalidStatus=无效
 cgiServlet.runOutputStreamFail=关闭输出流时发生I/O问题
 cgiServlet.runReaderInterrupt=对于标准错误的读线程，中断并等待
。
 
+defaultServlet.blockExternalSubset=用名称[{0}]和baseURI[{1}]阻止对外部子集的访问
+
 directory.filename=文件名
 directory.size=大小
 

Modified: 
tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -30,6 +30,7 @@ persistentManager.swapTooManyActive=å¤
 
 standardManager.loading.exception=加载持久化会话时发生异常
 standardManager.managerLoad=从持久化存储加载会话发生异常
+standardManager.managerUnload=卸载会话到持久存储的异常
 
 standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
 standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
 Fri Dec 14 15:11:29 2018
@@ -23,6 +23,7 @@ mcastServiceImpl.unable.join=无æ³�
 mcastServiceImpl.unableReceive.broadcastMessage=无法接收广播消息。
 
 memberImpl.large.payload=负载太大对于处理许多...
+memberImpl.notEnough.bytes=成员包中的字节不够。
 
 staticMember.invalid.uuidLength=UUID必
须正好是16个字节，而不是：[{0}]
 

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_zh_CN.properties
 Fri Dec 14 15:11:29 2018
@@ -15,5 +15,6 @@
 
 PooledSender.senderDisconnectFail=与 sender 断开连接失败
 
+receiverBase.bind.failed=对内容类型[{2}]返回[{3}]使用[{0}]匹配[{1}]
 receiverBase.socket.bind=服务器套接字接收器绑定到：[{0}]
 receiverBase.unable.bind=无法绑定套接字端口:{{0}}，出现异常

Modified: 
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+customObjectInputStream.logRequired=使用日志记录进行类名过滤需要一个有效的日志记录器
 customObjectInputStream.nomatch=类不能匹配合适的表达式，因
为类被允许反序列化
 
 extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: 
请求的拓展[{2}]未找到。

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -30,7 +30,7 @@ http.401.reason=未经授权
 http.402.desc=这个状态码时为未来使用预留的.
 http.403.desc=服务器理解该请求但拒绝授权。
 http.403.reason=被禁止
-http.404.reason=Not Found
+http.404.reason=未找到
 http.405.desc=请求行中接收的方法由源服务器知道，但目æ 
‡èµ„源不支持
 http.407.reason=代理需要认证
 
http.412.desc=在服务器上测试时，请求头字段中给出的一个或多个条件被评估为false。

Modified: tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties Fri Dec 
14 15:11:29 2018
@@ -14,7 +14,9 @@
 # limitations under the License.
 
 abstractConnectionHandler.ioexception.debug=正常的 IOException，忽略
+abstractConnectionHandler.processorPop=从缓存中弹出的处理器[{0}]
 
+abstractProcessor.fallToDebug=注意：进一步出现的请求解析错误将在DEBUG级别进行记录。
 abstractProcessor.hostInvalid=[{0}] 是无效主机
 
abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
 abstractProcessor.socket.ssl=获取SSL属性异常

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
 Fri Dec 14 15:11:29 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+chunkedInputFilter.eos=读取请求主体时流的意外结束
 chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
 chunkedInputFilter.error=没有数据可用由于先前的错误
 chunkedInputFilter.invalidCrlfCRCR=无效的结束的行序列（CRCR)

Modified: 
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties Fri 
Dec 14 15:11:29 2018
@@ -19,6 +19,7 @@ connectionPrefaceParser.mismatch=请�
 
 connectionSettings.debug=连接[{0}]，参数类型[{1}]设置为[{2}]
 connectionSettings.headerTableSizeLimit=连接 [{0}]，尝试将 header 
表大小设置为 [{1}]，但限制为 16k
+connectionSettings.maxFrameSizeInvalid=连接[{0}]，请求的最大帧大小[{1}]在[{2}]到[{3}]的å
…è®¸èŒƒå›´ä¹‹å¤–
 
 hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因
为它超出了允许的0到255范围。
 
@@ -36,6 +37,8 @@ stream.inputBuffer.reset=流.重ç
 
 streamProcessor.service.error=请求处理期间出错
 
+streamStateMachine.invalidReset=连接[{0}]，流[{1}]，状态[{2}]，在这种状态下不å
…è®¸é‡ç½®
+
 upgradeHandler.ioerror=连接[{0}]
 upgradeHandler.pingFailed=对客户端发送ping 链接失败.
 upgradeHandler.socketCloseFailed=关闭 socket 错误

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -64,6 +64,7 @@ jsp.error.page.invalid.iselignored=�
 jsp.error.page.invalid.session=页面提示：session值无效
 jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
 jsp.error.param.invalidUse=jsp:param 
不能在jsp:include、jsp:forward或jsp:params等元素外使用
+jsp.error.paramexpected=使用“name”和“value”属性期望“jsp:param”æ
 ‡å‡†æ“ä½œ
 jsp.error.parse.xml=无法解析 XML 文件 [{0}]
 jsp.error.parse.xml.invalidPublicId=无效的 PUBLIC ID: [{0}]
 jsp.error.plugin.wrongRootElement=[{0}] 中的根元素的名称与 [{1}] 
的不同

Added: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties?rev=1848951&view=auto
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+baseModelMBean.nullListener=监听器为空
+
+modules.nullMethod=[{0}] 没有方法参数
+modules.readDescriptorsError=读取描述文件出错
+
+registry.registerError=注册 MBean 出错

Propchange: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties 
Fri Dec 14 15:11:29 2018
@@ -16,6 +16,7 @@
 channel.nio.ssl.closing=频道处于正在关闭(closing)的状态
 channel.nio.ssl.foundHttp=找到一个明文HTTP请求，它应该是一个加
密的TLS连接
 channel.nio.ssl.invalidCloseState=无效的å…
³é—­çŠ¶æ€ï¼Œä¸ä¼šå‘送网络数据。
+channel.nio.ssl.sniDefault=无
法缓冲足够的数据来确定请求的SNI主机名。使用默认值
 channel.nio.ssl.sniHostName=连接 [{0}]
 channel.nio.ssl.timeoutDuringHandshake=握手期间超时。
 channel.nio.ssl.unwrapFail=无法解包数据，无效状态 [{0}]
@@ -38,6 +39,7 @@ endpoint.init.notavail=APR.不可�
 endpoint.invalidJmxNameSslHostCert=对于SSLHostConfigCertificateå…
³è”的主机[{0}]和证书类型[{1}]，无法生成有效的XML对象名称
 endpoint.nio.stopLatchAwaitInterrupted=在等待
轮询器停止时，该线程被中断
 endpoint.nio.timeoutCme=处理超时异常. 这段代ç 
å·²ç»è¢«é‡å¤æ£€æŸ¥å¹¶ä¸”没有并发修改发现。如果你
能重现这个错误，请提交一个tomcat bug, 提供重现步骤.
+endpoint.noSslHostConfig=没有找到带有hostName[{0}]的SSLHostConfig元素
，以匹配连接器[{1}]的默认SSLHostConfigName
 endpoint.noSslHostName=SSL主机中没有被提供主机名
 endpoint.process.fail=分配 socket 处理器出错
 endpoint.processing.fail=运行.套接字处理器出错

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties?rev=1848951&r1=1848950&r2=1848951&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
 Fri Dec 14 15:11:29 2018
@@ -17,5 +17,6 @@ pojoEndpointServer.getPojoInstanceFail=�
 
 pojoMessageHandlerWhole.decodeIoFail=解码消息时出现IO错误
 
+pojoMethodMapping.duplicateAnnotation=类[{1}]上存在的重复注释[{0}]
 
pojoMethodMapping.duplicateLastParam=用OnMessage注释的类[{1}]的方法[{0}]上存在多个布尔参数（最后的）
 pojoMethodMapping.invalidDecoder=这个特定类型的解码器[{0}]无
法被实例化



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