svn commit: r1848308 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/core/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/ ...

[markt]

Author: markt
Date: Thu Dec  6 13:22:10 2018
New Revision: 1848308

URL: http://svn.apache.org/viewvc?rev=1848308&view=rev
Log:
Sync Chinese (simplified) translations with POEditor

Added:
    
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties 
  (with props)
Modified:
    
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
    tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -38,6 +38,7 @@ singleSignOn.debug.cookieCheck=SSO检
 singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
 singleSignOn.debug.principalFound=SSO 
找到了带着认证类型的缓存代理
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删
除应用程序会话 [{0}]
+singleSignOn.debug.update=SSO 更新SSO 会话[{0}] 对认证 类型[{1}]
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 
session [{0}] 失效
 
singleSignOn.sessionExpire.managerError=由于会话管理器在检索会话时抛出异常，导致单点登录æ—
 æ³•ä½¿ä¼šè¯[{0}]失效
 

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=1848308&r1=1848307&r2=1848308&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 
Thu Dec  6 13:22:10 2018
@@ -26,10 +26,11 @@ applicationContext.setSessionTracking.is
 applicationDispatcher.specViolation.response=原始的ServletResponse或包装
后的ServletResponse未传递给RequestDispatcher，原因
：违反了SRV.8.2和SRV.14.2.5.1\n\
 \n
 
+applicationFilterConfig.release=失败的销毁过滤器类型为[{1}]名称为[{0}]
+
 
applicationFilterRegistration.nullInitParams=由于name和(或)value为null，æ—
 æ³•ä¸ºè¿‡æ»¤å™¨è®¾ç½®åˆå§‹åŒ–参数。name为 [{0}]，value为 [{1}]
 
 applicationPushBuilder.methodNotToken=HTTP方法必须是令牌(token)，但 
[{0}] 包含非令牌字符
-applicationPushBuilder.noCoyoteRequest=无
法从该类型[{0}]请求中获取底层Coyote的请求的对象（这个对象被用来创建一个推送请求）
 
 aprListener.aprInitError=基于APR的本地库加载失败.错误报告为[{0}]
 aprListener.initializeFIPSSuccess=成功的进入FIPS 模式
@@ -87,6 +88,8 @@ standardHost.notContext=主机çš
 
 
standardServer.accept.timeout=在调用accept()方法之后，侦听shutdown命令的套接字经历了意外的è¶
…æ—¶[{0}]毫秒。 这是bug 56684的一个例子？
 
+standardService.engine.stopFailed=失败停止关联的引擎
+
 standardWrapper.destroyInstance=servlet[{0}]实例管理销毁(destroy) 
抛出异常
 standardWrapper.isUnavailable=Servlet [{0}]当前不可用。
 standardWrapper.notChild=Wrapper容器内部不允许有子容器。

Modified: 
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -16,4 +16,5 @@
 namingResources.cleanupCloseSecurity=无
法检索容器[{2}]中的资源[{1}]的方法[{0}]，因
此没有对该资源进行清理
 
namingResources.ejbLookupLink=EJB的引用[{0}]同时指定了ejb-link和lookup-name
 namingResources.envEntryLookupValue=环境参数 [{0}] 指定查询名称和值
+namingResources.mbeanDestroyFail=失败的销毁命名资源[{0}]为MBean
 
namingResources.resourceTypeFail=名为[{0}]的JNDI资源是类型[{1}]，但是该类型与为该资源é
…ç½®çš„注入目标的类型不一致

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -22,6 +22,7 @@ farmWarDeployer.removeFailRemote=本�
 farmWarDeployer.removeLocalFail=无法移除WAR文件
 farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无
法从备份群集节点中删除它
 farmWarDeployer.undeployEnd=从[{0}]取消部署完成。
+farmWarDeployer.undeployLocal=不能部署本地上下文[{0}]
 
 fileMessageFactory.deleteFail=无法删除 [{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=1848308&r1=1848307&r2=1848308&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 
Thu Dec  6 13:22:10 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 backupManager.noCluster=没有与此上下文关联的集群：[{0}]
+backupManager.stopped=管理者[{0}]正在停止。
 
 
deltaManager.createSession.newSession=用id[{0}]创建一个扩展会话(DeltaSession)，总数为
 [{1}]
 deltaManager.foundMasterMember=复制主master 
成员在上下文中被发现.\n

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -21,6 +21,7 @@ htmlManagerServlet.appsReload=重æ–
 htmlManagerServlet.appsSessions=会话
 htmlManagerServlet.appsTasks=命令
 htmlManagerServlet.configReloadButton=重复读
+htmlManagerServlet.configSslHostName=TLS 主机名字（可选)
 htmlManagerServlet.configSslReloadTitle=重新读取 TLS 配置文件
 htmlManagerServlet.connectorStateBytesSent=发送.字节:
 htmlManagerServlet.connectorStateProcessingTime=处理时间：

Modified: 
tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -16,3 +16,4 @@
 mapper.addHostAlias.success=为虚拟主机 [{1}] 注册了别名 [{0}]
 
 
mapperListener.registerWrapper=为服务Service[{2}]在上下文Context[{1}]注册Wrapper[{0}]
+mapperListener.unregisterHost=在域[{1}]中.,不能注册主机[{0}]为服务[{2}]

Modified: 
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -25,6 +25,7 @@ jaasRealm.failedLogin=由于登
 jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
 jaasRealm.loginException=登录异常，认证用户名  [{0}]
 
+jndiRealm.authenticateFailure=用户名[{0}]没有成功认证
 jndiRealm.authenticateSuccess=用户名[{0}]成功认证
 jndiRealm.cipherSuites=启用 [{0}] 作为 TLS 连接的加密套件。
 jndiRealm.exception=执行认证异常

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=1848308&r1=1848307&r2=1848308&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 
Thu Dec  6 13:22:10 2018
@@ -21,6 +21,7 @@ fileStore.deleteFailed=无法åˆ�
 managerBase.contextNull=使用 Manager 之前，必须将 Context 设置为非 
null 值
 managerBase.createSession.ise=createSession：活跃session过多
 
+persistentManager.deserializeError=错误反序列化会话[{0}]: [{1}]
 persistentManager.storeKeysException=不能从 session存储中获取session 
ID 的列表，假设存储为空
 persistentManager.storeSizeException=无法确定 session 
存储区的会话数，假定存储区为空
 persistentManager.swapIn=在表单存储中,交换会话[{0}]

Modified: 
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+catalina.incorrectPermissions=权限错误，此文件没有读取权限
+catalina.init=服务器在[{0}]毫秒内初始化
 catalina.serverStartFail=所必需的服务组件启动失败，所以无
法启动Tomcat
 
 catalinaConfigurationSource.cannotObtainURL=无法获取相对路径 [{0}] 
的URL。 检查catalina.base是否已设置。
@@ -22,6 +24,7 @@ contextConfig.applicationStart=æ­£å�
 contextConfig.applicationUrl=无法确定应用程序 web.xml 的URL
 contextConfig.authenticatorConfigured=为方法 [{0}] 配置了验证器
 contextConfig.authenticatorMissing=不能配置一个认证为方法[{0}]
+contextConfig.badUrl=不能处理上下文描述符[{0}]
 contextConfig.cce=生命周期事件数据对象[{0}] 不是一个上下文
 contextConfig.contextMissing=缺少 context.xml：[{0}]
 contextConfig.defaultMissing=未找到全局 web.xml
@@ -29,8 +32,7 @@ contextConfig.defaultPosition=发ç”
 contextConfig.fixDocBase=上下文[{0}]的异常修复docBase
 contextConfig.init=上下文配置: 正在初始化
 contextConfig.inputStreamWebResource=不能处理注释的Web资源[{0}]
-contextConfig.jndiUrlNotDirContextConn=为URL [{0}] 
创建的连接不是DirContextURLConnection
-contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
+contextConfig.jspFile.error=JSP文件[{0}]必须以''/'开头。
 contextConfig.processAnnotationsDir.debug=使用注解 
[{0}]扫描目录中的类文件
 contextConfig.processAnnotationsWebDir.debug=扫描 web 
应用程序目录下含有 [{0}] 注解的 class 文件
 contextConfig.role.runas=<run-as> 中使用的安全角色名 [{0}]，未在 
<security-role> 中定义
@@ -52,6 +54,7 @@ hostConfig.docBaseUrlInvalid=所æ�
 hostConfig.expanding=扩展已发现的 web 应用程序 archive
 hostConfig.stop=:)Host配置:停止处理
 
+tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
 tomcat.homeDirMakeFail=无法创建用作主目录的目录 [{0}]
 tomcat.invalidCommandLine=无效的命令行参数 [{0}]
 tomcat.noContextXml=不能找到web 应用的context.xml [{0]}

Added: 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties?rev=1848308&view=auto
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties 
(added)
+++ 
tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -0,0 +1,16 @@
+# 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.
+
+config.objectNameNotFound=目标[{0}]未找到

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

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -49,6 +49,7 @@ tcpFailureDetector.heartbeat.failed=TCP�
 tcpFailureDetector.still.alive=验证完成。成员 [{0}] 仍然存活
 
 tcpPingInterceptor.ping.failed=无法发送 TCP ping
+tcpPingInterceptor.pingFailed.pingThread=不能从ping 线程发送ping
 
 throughputInterceptor.report=吞吐量拦截器 报告[\n\
 \   传输消息: {0} 消息数.\n\

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=1848308&r1=1848307&r2=1848308&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
 Thu Dec  6 13:22:10 2018
@@ -22,6 +22,8 @@ mcastServiceImpl.send.running=McastServi
 mcastServiceImpl.unable.join=无法加入多播组，请确保你
的系统已启用多播。
 mcastServiceImpl.unableReceive.broadcastMessage=无法接收广播消息。
 
+memberImpl.large.payload=负载太大对于处理许多...
+
 staticMember.invalid.uuidLength=UUID必
须正好是16个字节，而不是：[{0}]
 
 staticMembershipProvider.leftOver.ignored=消息 [{0}] 被忽略。

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -16,6 +16,7 @@
 bioReceiver.socket.closeFailed=socket.关闭失败
 bioReceiver.threadpool.fail=线程池可以初始化。侦听器未启动
 
+bioReplicationTask.messageDataReceived.error=错误抛出，来自于消息数据收到
 bioReplicationTask.reader.closeFailed=无法关闭reader
 bioReplicationTask.socket.closeFailed=无法关闭套接字
 bioReplicationTask.unable.service=不能服务bio套接字

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -16,6 +16,7 @@
 nioReceiver.alreadyStarted=ServerSocketChannel已经被启动
 nioReceiver.cleanup.fail=无法清除关闭的选择器
 
nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。
+nioReceiver.run.fail=不能允许复制监听器
 nioReceiver.start.fail=无法启动集群接收器
 nioReceiver.stop.fail=无法关闭集群接收的选择器
 nioReceiver.threadpool.fail=ThreadPool 无法初始化。 监听器未启动。

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=1848308&r1=1848307&r2=1848308&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 
Thu Dec  6 13:22:10 2018
@@ -20,10 +20,12 @@ accessLogValve.openFail=无法æ‰
 accessLogValve.rotateFail=失败的循环切割访问日志.
 
 errorReportValve.description=描述
+errorReportValve.exceptionReport=异常报告
 errorReportValve.message=消息
 errorReportValve.rootCauseInLogs=主要问题的全部 stack 信息可以在 
server logs 里查看
 errorReportValve.unknownReason=未知的原因
 
+http.400.reason=错误的请求
 http.401.reason=未经授权的
 http.402.desc=这个状态码时为未来使用预留的.
 http.403.desc=服务器理解该请求但拒绝授权。
@@ -36,6 +38,8 @@ http.412.reason=前置条件
 http.413.reason=有效载荷过大
 http.415.desc=源服务器拒绝服务请求，因为有效负载的æ 
¼å¼åœ¨ç›®æ ‡èµ„源上此方法不支持。
 http.415.reason=不支持的媒体类型
+http.416.reason=范围不满足
+http.417.reason=期望的失败
 http.423.reason=已锁定
 http.426.reason=需要升级
 http.428.desc=原始服务器要求请求是有条件的。

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -15,10 +15,10 @@
 
 cache.addFail=无法将位于[{0}]的资源添加
到Web应用程序[{1}]的缓存中，因为在清
除过期缓存条目后可用空间仍不足 - 请考虑增加
缓存的最大空间。
 
-dirResourceSet.writeExists=写入的目标已经存在
-
 extractingRoot.targetFailed=无法为提取的 JAR 文件创建目录 [{0}]
 
+fileResource.getUrlFail=不能决定一个url 为资源[{0}]
+
 jarResource.getUrlFail=无法确定JAR[{1}]中的资源[{0}]的URL
 
 standardRoot.checkStateNotStarted=如果当前未启动资源，则可能无
法访问这些资源

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=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties Thu Dec  
6 13:22:10 2018
@@ -22,6 +22,7 @@ abstractProcessor.socket.ssl=获�
 abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时
 abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
 abstractProtocolHandler.init=初始化协议处理器 [{0}]
+abstractProtocolHandler.start=开始协议处理句柄[{0}]
 
 asyncStateMachine.invalidAsyncState=调用[{0}]对于å…
·æœ‰å¼‚步状态[{1}]的请求无效
 

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties Thu 
Dec  6 13:22:10 2018
@@ -16,6 +16,7 @@
 ajpmessage.null=不能赋空值
 ajpmessage.overflow=在缓冲区[{1}]位置添加
[{0}]字节时发生溢出错误
 
+ajpprocessor.failedsend=失败的发送AJP消息
 ajpprocessor.header.error=头部信息解析失败
 
 ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议é…
ç½®è¢«å¿½ç•¥ã€‚

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=1848308&r1=1848307&r2=1848308&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
 Thu Dec  6 13:22:10 2018
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
+chunkedInputFilter.error=没有数据可用由于先前的错误
+chunkedInputFilter.invalidCrlfCRCR=无效的结束的行序列（CRCR)
 chunkedInputFilter.invalidCrlfNoCR=无
效的行尾结束符序列(LF前缺少CR)
 chunkedInputFilter.maxExtension=超过最大扩展数
 chunkedInputFilter.maxTrailer=超过最大数

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=1848308&r1=1848307&r2=1848308&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 
Thu Dec  6 13:22:10 2018
@@ -21,7 +21,9 @@ jsp.error.attribute.noequal=期望
 jsp.error.attribute.noescape=属性值[{0}]引用[{1}]，在值内使用时必
须被转义。
 jsp.error.attribute.nowhitespace=JSP 规范要求一个属性名字前有空格
 jsp.error.bad.scratch.dir=你指定的 scratchDir：[{0}] 不可用。
+jsp.error.bad_attribute=属性[{0}]无效为tag[{1}] 通过TLD
 jsp.error.beans.noproperty=在[{1}]类型bean中找不到任何有å…
³å±žæ€§[{0}]的信息
+jsp.error.beans.nullbean=尝试获取一个bean 操作在一个空对象上.
 jsp.error.compiler=没有可用的Java编译器
 jsp.error.corresponding.servlet=生成的servlet错误:\n\
 \n
@@ -47,7 +49,6 @@ jsp.error.lastModified=无法ç¡�
 jsp.error.loadclass.taghandler=无法为TAG [{1}]加载æ 
‡è®°å¤„理程序类[{0}]
 jsp.error.location=行.: [{0}], 列: [{1}]
 jsp.error.mandatory.attribute=[{0}]: 强制性属性 [{1}] 缺失。
-jsp.error.multiple.jsp=不能有.多个规格
 jsp.error.nested.jspbody=JSP：体标准动作不能嵌套在另一个jsp:body 
或者 jsp:属性标准动作中
 jsp.error.nested_jsproot=嵌套的&lt;jsp:root&gt;
 jsp.error.no.scratch.dir=JSP引擎未配置scratch文件夹。\n\
@@ -91,14 +92,9 @@ jsp.error.unknown_attribute_type=\n\
 \ 属性[{0}]的未知属性类型[{1}]。
 jsp.error.unsupported.encoding=不支持的编码：[{0}]
 jsp.error.variable.either.name=必须在变量指令中指定 name-given 或 
name-from-attribute 属性
-jsp.error.xml.encodingDeclInvalid=编码名称[{0}]无效。
-jsp.error.xml.invalidCharInPI=处理指令时发现一个无
效的XML字符(Unicode: 0x[{0}])
-jsp.error.xml.pseudoAttrNameExpected=需要一个伪属性.名称。
-jsp.error.xml.quoteRequiredInXMLDecl=[{0}]对应的值在XML文件中的声明å¿
…须是引用字符串
-jsp.error.xml.versionNotSupported=XML版本 [{0}] 不被支持，只支持XML 
1.0。
-jsp.error.xml.xmlDeclUnterminated=XML声明必须以“？>”结尾。
 jsp.exception=在 [{1}] 行处理 [{0}] 时发生异常
 jsp.info.ignoreSetting=因为 SecurityManager 被启用，忽略 [{1}] 的 
[{0}] 的设置
+jsp.message.jsp_added=增加JSP 为路径[{0}]为上下文[{1}]的队列
 
jsp.message.jsp_queue_update=在上下文[{1}]队列中更新路径为[{0}]的JSP
 
jsp.message.jsp_removed_excess=从上下文[{1}]的队列中移除额外在路径[{0}]中JSP，
 jsp.tldCache.noTldSummary=至少有一个JAR被扫描用于TLD但尚未包
含TLD。 
为此记录器启用调试日志记录，以获取已扫描但未在å…
¶ä¸­æ‰¾åˆ°TLD的完整JAR列表。 
在扫描期间跳过不需要的JAR可以缩短启动时间和JSP编译时间。
@@ -108,6 +104,7 @@ jsp.warning.dumpSmap=警告：�
 jsp.warning.enablePooling=警告：initParam enablePooling的值无
效。将使用默认值“true”
 jsp.warning.fork=警告：initParam的值无
效。将使用“true”的默认值
 jsp.warning.unknown.element.in.attribute=属性中的未知元素 [{0}]
+jsp.warning.unknown.element.in.function=未知的元素[{0}]在函数。
 jsp.warning.unknown.element.in.tag=标签中的未知元素 [{0}]
 jsp.warning.unknown.element.in.tagfile=标签文件中的未知元素 [{0}]
 jsp.warning.unknown.element.in.taglib=标签文件中的未知元素 [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
 Thu Dec  6 13:22:10 2018
@@ -27,6 +27,7 @@ http.invalidCharacterDomain.atStart=å­
 http.invalidHextet=hextet无效。 hextet必须包含4个或更少的十å…
­è¿›åˆ¶å­—符。
 http.invalidLeadingZero=非零的IPv4字符可能不包含前导零。
 http.invalidOctet=无效字符[{0}].IPv4字符的有效范围为0～255。
+http.noClosingBracket=ipv6 地址缺失一个闭合的圆括号
 http.singleColonEnd=IPv6地址不能以单个“.”结尾。
 
http.singleColonStart=一个IPv6地址也许不是以单个冒号":"开头的。
 http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties?rev=1848308&r1=1848307&r2=1848308&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties 
Thu Dec  6 13:22:10 2018
@@ -18,6 +18,8 @@ cookies.name=名.称:
 cookies.no-cookies=你的浏览器未发送任何cookie
 cookies.set=你刚刚将以下cookie发送到你的浏览器：
 
+helloworld.title=你好，世界.
+
 requestheader.title=请求 Header 示例
 
 requestinfo.label.method=方法：
@@ -27,6 +29,7 @@ requestinfo.title=请求信æ
 
 requestparams.firstname=姓：
 requestparams.no-params=没有参数，请输入一些
+requestparams.params-in-req=参数在请求中.
 requestparams.title=请求参数示例
 
 sessions.adddata=将数据添加到你的会话中



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