svn commit: r1847236 - in /tomcat/trunk: java/org/apache/catalina/connector/ 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/ha/tcp/ java/...

Fri, 23 Nov 2018 01:45:01 -0800 

Author: markt
Date: Fri Nov 23 09:44:51 2018
New Revision: 1847236

URL: http://svn.apache.org/viewvc?rev=1847236&view=rev
Log:
Simplified Chinese translation updates

Modified:
    
tomcat/trunk/java/org/apache/catalina/connector/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/ha/tcp/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/realm/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/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/io/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/tipis/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/users/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/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/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/naming/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -32,6 +32,9 @@ coyoteRequest.noMultipartConfig=由ä
 
coyoteRequest.setAttribute.namenull=不能在一个空的名字上调用setAttribute
 
 coyoteResponse.encoding.invalid=JRE无法识别编码[{0}]
+coyoteResponse.sendRedirect.note=<html><body><p>重定向到<a 
href="{0}">{0}</a></p></body></html>
+
+request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作。
 
 requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
 

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -16,6 +16,7 @@
 applicationContext.addJspFile.iae=JSP 文件 [{0}] 不可用
 applicationContext.addListener.iae.cnfe=无法创建类型为 [{0}] 的实例
 
applicationContext.addListener.iae.wrongType=指定的类型[{0}]不是预期的侦听器类型之一
+applicationContext.attributeEvent=属性事件监听器引发的异常
 applicationContext.invalidServletName=由于servlet名称[{0}]无效，无
法添加对应servlet的定义。
 applicationContext.mapping.error=映射中.的错误
 applicationContext.setAttribute.namenull=Name 不能为 null
@@ -28,12 +29,15 @@ applicationDispatcher.specViolation.resp
 
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 模式
 aprListener.initializingFIPS=初始化FIPS模式...
 aprListener.tooLateForSSLRandomSeed=无法设置 
SSLRandomSeed：SSL已经初始化
 
 containerBase.backgroundProcess.error=处理后台线程异常
+containerBase.backgroundProcess.unexpectedThreadDeath=后台线程[{0}]意外结束
 containerBase.nullName=容器名称不能为null
 containerBase.threadedStartFailed=子容器启动失败
 
@@ -49,6 +53,7 @@ naming.invalidEnvEntryType=环境�
 naming.wsdlFailed=未找到 wsdl 文件：[{0}]
 
 standardContext.backgroundProcess.resources=异常处理资源[{0}] 
后台进程
+standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 
设置为null
 standardContext.errorPage.required=ErrorPage不能为null
 standardContext.errorPage.warning=警告：在Servlet 2.4中，错误页位置 
[{0}] 必须以"/"开头
 standardContext.filterMap.either=过滤器映射必须指定 <url-pattern> 或 
<servlet-name>
@@ -61,15 +66,23 @@ standardContext.loginConfig.errorPage=è
 standardContext.loginConfig.errorWarning=警告：Servlet 
2.4中，表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必
须以''/''开头
 standardContext.managerFail=会话管理器无法启动
+standardContext.namingResource.init.fail=未能初始化新的命名资源
 standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
 standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 
方法定义重复
+standardContext.resourcesStart=启动静态资源出错
 standardContext.resourcesStop=停止静态资源时出错
 
standardContext.securityConstraint.mixHttpMethod=在相同的web资源集合中不å
…è®¸æ··ç”¨: <http-method> 和 <http-method-omission>
 standardContext.securityConstraint.pattern=安全约束中的<url-pattern> 
[{0}] 无效
 standardContext.servletFail=启动时无法加载一个或多个Servlet。 å…
¨éƒ¨çš„详细信息可在相应的容器日志文件中找到
+standardContext.stoppingContext=异常停止的上下文使用名为[{0}]
 
standardContext.unknownCookieEncoding=为setCookieEncoding(String)指定了未知编ç
 [{0}]，因此将使用默认的UTF-8。
 
+standardContextValve.acknowledgeException=以100（继续）响应确认请求失败
+
+standardEngine.notParent=引擎不能有父容器
+
 standardHost.noContext=没有配置上下文来处理此请求
+standardHost.notContext=主机的子节点必须有上下文
 
 
standardServer.accept.timeout=在调用accept()方法之后，侦听shutdown命令的套接字经历了意外的è¶
…æ—¶[{0}]毫秒。 这是bug 56684的一个例子？
 

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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -16,3 +16,4 @@
 namingResources.cleanupCloseSecurity=无
法检索容器[{2}]中的资源[{1}]的方法[{0}]，因
此没有对该资源进行清理
 
namingResources.ejbLookupLink=EJB的引用[{0}]同时指定了ejb-link和lookup-name
 namingResources.envEntryLookupValue=环境参数 [{0}] 指定查询名称和值
+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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -17,6 +17,7 @@ farmWarDeployer.hostOnly=FarmWarDeployer
 farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
 farmWarDeployer.modInstallFail=无法安装 WAR 文件
 farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
+farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，å…
¶ä»–经理有app在服务！
 farmWarDeployer.removeLocalFail=无法移除WAR文件
 farmWarDeployer.servicingUndeploy=正在处理应用程序[{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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -19,6 +19,7 @@ deltaManager.createSession.newSession=ç
 deltaManager.foundMasterMember=复制主master 
成员在上下文中被发现.\n
 deltaManager.loading.cnfe=加载持久化会话 [{0}] 
时出现ClassNotFoundException
 deltaManager.loading.ioe=加载持久 session 时出现 IOException：[{0}]
+deltaManager.noSessionState=管理者
[{0}]：没有收到[{1}]发送的会话状态，在[{2}]毫秒之后超时。
 deltaManager.receiveMessage.expired=管理器[{0}]: 接收到的会话 [{1}] 
已过期。
 deltaManager.receiveMessage.unloadingBegin=管理器[{0}]: 开始卸载会话
 deltaManager.sendMessage.newSession=\ 管理器 [{0}] 发送新的会话 [{1}]

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -19,4 +19,5 @@ ReplicationValve.session.found=上ä�
 simpleTcpCluster.clustermanager.notImplement=连接器 [{0}] 不能继承 
ClusterManager，除非集群被停止。
 simpleTcpCluster.member.addFailed=无法连接到复制系统。
 simpleTcpCluster.member.disappeared=收到成员消失:[{0}]
+simpleTcpCluster.member.removeFailed=无法从复制系统中移除集群节点
 simpleTcpCluster.stopUnable=无法停止集群

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+webappClassLoader.addTransformer=将类文件转换器[{0}]添加
到Web应用程序[{1}]。
 webappClassLoader.checkThreadLocalsForLeaks.badValue=无法确定类型为 
[{0}] 的值的字符串表示形式
 webappClassLoader.checkThreadLocalsForLeaks.unknown=:)未知
 webappClassLoader.checkThreadLocalsForLeaksNone=web应用程序 [{0}] 
创建了1个ThreadLocal变量(键：[{2}] (类型[{1}]) 
，值：[{4}](类型[{3}]) )。键仅被ThreadLocal 
Map弱引用，所以不是内存泄露。

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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -23,6 +23,7 @@ htmlManagerServlet.configReloadButton=é
 htmlManagerServlet.configSslReloadTitle=重新读取 TLS 配置文件
 htmlManagerServlet.connectorStateBytesSent=发送.字节:
 htmlManagerServlet.connectorStateProcessingTime=处理时间：
+htmlManagerServlet.connectorStateTableTitleClientForw=客户端（转发）
 htmlManagerServlet.connectorStateTableTitleRequest=请求
 htmlManagerServlet.connectorStateTableTitleTime=时间
 htmlManagerServlet.connectorStateTableTitleVHost=虚拟主机
@@ -37,12 +38,15 @@ htmlManagerServlet.diagnosticsLeak=�
 htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已é…
ç½®çš„TLS虚拟主机以及各自的证书链
 htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
 htmlManagerServlet.diagnosticsTitle=诊断
+htmlManagerServlet.expire.unit=分钟
+htmlManagerServlet.helpHtmlManager=HTML管理器帮助
 htmlManagerServlet.jvmFreeMemory=剩余内存：
 htmlManagerServlet.jvmTableTitleMaximum=最大.值
 htmlManagerServlet.jvmTableTitleMemoryPool=内存.池
 htmlManagerServlet.jvmTotalMemory=总内存
 htmlManagerServlet.manager=管理器
 htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=未指定
 htmlManagerServlet.serverHostname=主机名
 htmlManagerServlet.serverIPAddress=IP地址
 htmlManagerServlet.serverJVMVersion=JVM.版本

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -31,6 +31,7 @@ hostManagerServlet.stopFailed=失è´
 hostManagerServlet.stopped=OK - 主机 [{0}] 已停止
 hostManagerServlet.unknownCommand=FAIL - 未知命令 [{0}]
 
+htmlHostManagerServlet.addAppBase=应用程序库：
 htmlHostManagerServlet.addAutoDeploy=自动.部署
 htmlHostManagerServlet.addCopyXML=拷贝XML
 htmlHostManagerServlet.addDeployOnStartup=启动.部署
@@ -50,4 +51,5 @@ htmlHostManagerServlet.serverOSArch=OS �
 htmlHostManagerServlet.serverTitle=服务器信息
 htmlHostManagerServlet.title=Tomcat虚拟主机管理员
 
+statusServlet.complete=服务器全部状态
 statusServlet.title=服务器状态

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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -22,6 +22,7 @@ jaasCallback.username=返回用
 
 jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 
[{1}] -- 主体也已创建
 jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
+jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
 
 jndiRealm.authenticateSuccess=用户名[{0}]成功认证
 jndiRealm.cipherSuites=启用 [{0}] 作为 TLS 连接的加密套件。

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -18,6 +18,7 @@ cgiServlet.find.location=在 [{0}] æ
 cgiServlet.runHeaderReaderFail=I/O 问题关闭请求头读操作
 cgiServlet.runInvalidStatus=无效状态 [{0}]
 cgiServlet.runOutputStreamFail=关闭输出流时发生I/O问题
+cgiServlet.runReaderInterrupt=对于标准错误的读线程，中断并等待
。
 
 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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -23,10 +23,14 @@ managerBase.createSession.ise=createSess
 
 persistentManager.storeSizeException=无法确定 session 
存储区的会话数，假定存储区为空
 persistentManager.swapIn=在表单存储中,交换会话[{0}]
+persistentManager.swapMaxIdle=交换会话[{0}]以存储，空闲为[{1}]秒
+persistentManager.swapTooManyActive=太多活跃会话,替换闲置 [{1}] 
秒的会话 [{0}]
 
 standardManager.loading.exception=加载持久化会话时发生异常
 standardManager.managerLoad=从持久化存储加载会话发生异常
 
+standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
+standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效
 standardSession.getValueNames.ise=getValueNames：会话已经失效
 standardSession.logoutfail=当回话将过期登出用户异常
 standardSession.notDeserializable=无法反序列化会话 [{1}] 的属性 
[{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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -36,6 +36,7 @@ contextConfig.role.runas=<run-as> 中
 contextConfig.tomcatWebXmlError=处理 /WEB-INF/tomcat-web.xml 发生错误
 
 engineConfig.cce=生命周期事件数据对象[{0}]不是一个引擎(Engine)
+engineConfig.stop=配置引擎，处理进程停止。
 
 expandWar.copy=错误的拷贝[{0}] to [{1}]
 expandWar.createFailed=无法创建文件夹[{0}]。
@@ -43,8 +44,10 @@ expandWar.deleteFailed=[{0}] 无æ³�
 
expandWar.deleteOld=发现一个展开的目录[{0}],它的最后修改时间与å
…³è”çš„WAR不一致.它将被删除.
 expandWar.missingJarEntry=无法获得 JarEntry [{0}] 的输入流 - WAR 
文件是否已损坏?
 
+hostConfig.appBase=主机[{0}]的应用程序基础[{1}]不存在或不是目录。deployOnStartUp和autoDebug已设置为false，以防止部署错误。å
…¶ä»–错误仍然可能发生。
 hostConfig.deployDir=部署 web 应用程序目录 [{0}]
 hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
+hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
 hostConfig.expanding=扩展已发现的 web 应用程序 archive
 hostConfig.stop=:)Host配置:停止处理
 
@@ -58,6 +61,7 @@ userConfig.error=为用户 [{0}
 userConfig.start=用户配置：处理开始
 
 versionLoggerListener.catalina.home=CATALINA_HOME:         {0}
+versionLoggerListener.java.home=Java 环境变量:             {0}
 versionLoggerListener.os.arch=结.造:          {0}
 versionLoggerListener.os.version=OS.版本:            {0}
 versionLoggerListener.prop=系统属性:       {0} = {1}

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=1847236&r1=1847235&r2=1847236&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
 Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 domainFilterInterceptor.member.refused=成员被拒绝加入集群 cluster[{0}]
+domainFilterInterceptor.message.refused=从集群[{0}]中接收的消息被拒绝
 
 encryptInterceptor.decrypt.error.short-message=失败的解密消息: 
提前结束的结尾消息
 encryptInterceptor.encrypt.failed=无法加密信息
@@ -44,6 +45,7 @@ staticMembershipInterceptor.no.pingInter
 staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
 
 tcpFailureDetector.failureDetection.failed=无
法进行失败监测，假定成员宕机。[{0}]
+tcpFailureDetector.heartbeat.failed=TCP心跳检测器无法执行心跳
 tcpFailureDetector.still.alive=验证完成。成员 [{0}] 仍然存活
 
 tcpPingInterceptor.ping.failed=无法发送 TCP ping

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -17,6 +17,7 @@ objectReader.retrieveFailed.socketReceiv
 
 replicationStream.conflict=和非公开接口类加载器冲突
 
+xByteBuffer.no.package=XByteBuffer中不存在数据包
 xByteBuffer.size.larger.buffer=大小比现有缓冲区大。
 xByteBuffer.unableCreate=不能创建数据包， buffer 太小
 xByteBuffer.wrong.class=消息对应类不符合要求。 
它应该实现Serializable，而不是：[{0}]。

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -16,6 +16,8 @@
 mcastService.missing.property=McastService：缺少必需属性 [{0}]。
 
 mcastServiceImpl.invalid.startLevel=无
效的启动级别。只接受以下级别：Channel.MBR_RX_SEQ或 
Channel.MBR_TX_SEQ
+mcastServiceImpl.recovery=家族成员，运行恢复线程，广播不是功能。
+mcastServiceImpl.recovery.stopFailed=恢复线程未能停止成员服务。
 mcastServiceImpl.send.running=McastService.send已经运行
 mcastServiceImpl.unable.join=无法加入多播组，请确保你
的系统已启用多播。
 mcastServiceImpl.unableReceive.broadcastMessage=无法接收广播消息。

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -18,3 +18,6 @@ abstractStream.fileNotFound=未找
 abstractStream.trustManagerError=无法为{0}创建信任管理器
 
 cloudMembershipService.stopFail=无法停止静态成员资æ 
¼æœåŠ¡ï¼Œçº§åˆ«ä¸ºï¼š[{0}]
+
+kubernetesMembershipProvider.memberError=创建成员错误
+kubernetesMembershipProvider.noNamespace=命名空间未设置

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -17,8 +17,11 @@ abstractReplicatedMap.broadcast.noReplie
 abstractReplicatedMap.leftOver.ignored=消息[{0}]被忽略
 abstractReplicatedMap.transferState.noReplies=ä¼ 
输状态，0响应，也许是超时。
 abstractReplicatedMap.unable.get=无法复制 AbstractReplicatedMap.get 
操作的数据
+abstractReplicatedMap.unableSend.startMessage=无法发送map启动消息。
 
 lazyReplicatedMap.unableReplicate.proxy=不能复制proxy 
key:[{0}]到备份:[{1}]. 原因是:[{2}]
 
+mapMessage.deserialize.error.value=MapMessage.value的反序列化误差
+
 replicatedMap.relocate.complete=map 条目的重定位在 [{0}] ms内完成。
 
replicatedMap.unable.relocate=不能为一个新的备份节点重启定位[{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=1847236&r1=1847235&r2=1847236&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
 Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 bioReceiver.socket.closeFailed=socket.关闭失败
+bioReceiver.threadpool.fail=线程池可以初始化。侦听器未启动
 
 bioReplicationTask.reader.closeFailed=无法关闭reader
 bioReplicationTask.socket.closeFailed=无法关闭套接字

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=1847236&r1=1847235&r2=1847236&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
 Fri Nov 23 09:44:51 2018
@@ -14,8 +14,10 @@
 # limitations under the License.
 
 nioReceiver.alreadyStarted=ServerSocketChannel已经被启动
+nioReceiver.cleanup.fail=无法清除关闭的选择器
 
nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。
 nioReceiver.start.fail=无法启动集群接收器
+nioReceiver.stop.fail=无法关闭集群接收的选择器
 nioReceiver.threadpool.fail=ThreadPool 无法初始化。 监听器未启动。
 
 nioReplicationTask.process.clusterMsg.failed=处理集群消息失败

Modified: 
tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -21,3 +21,4 @@ memoryUserDatabase.readOnly=用户
 memoryUserDatabase.reloadError=从更新后的源 [{1}] 重新加载内
存用户数据库 [{0}] 时出错
 memoryUserDatabase.renameNew=无法将新文件重命名为 [{0}]
 memoryUserDatabase.renameOld=原文件无法改名为[{0}]
+memoryUserDatabase.restoreOrig=无法往原始文件中保存[{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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -19,6 +19,7 @@ extensionValidator.extension-not-found-e
 extensionValidator.web-application-manifest=web 应用程序清单
 
 hexUtil.bad=坏的十六进制数字
+hexUtil.odd=奇数的十六进制数字
 
 introspection.classLoadFailed=加载 class [{0}] 失败
 
@@ -26,3 +27,5 @@ lifecycleBase.initFail=初始åŒ�
 
 netmask.cidrNegative=CIDR [{0}]为负数。
 netmask.invalidAddress=地址 [{0}] 无效
+
+sessionIdGeneratorBase.randomProvider=使用程序提供的初始化随机数生成器异常[{0}]

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -31,14 +31,17 @@ http.403.reason=被禁止
 http.404.reason=Not Found
 http.405.desc=请求行中接收的方法由源服务器知道，但目æ 
‡èµ„源不支持
 http.407.reason=代理需要认证
+http.412.desc=在服务器上测试时，请求头字段中给出的一个或多个条件被评估为false。
 http.412.reason=前置条件失败
 http.413.reason=有效载荷过大
+http.415.desc=源服务器拒绝服务请求，因为有效负载的æ 
¼å¼åœ¨ç›®æ ‡èµ„源上此方法不支持。
 http.415.reason=不支持的媒体类型
 http.423.reason=已锁定
 http.426.reason=需要升级
 http.428.desc=原始服务器要求请求是有条件的。
 http.429.reason=请求过多
 http.431.reason=请求头的字段太大
+http.500.desc=服务器遇到一个意外的情况，阻止它完成请求。
 http.502.desc=服务器在充当网关或代理时, 在尝试完成请求时, 
从它访问的入站服务器收到无效响应。
 http.503.desc=由于临时过载或计划维护，服务器当前无
法处理请求，这可能会在一些延迟后得到缓解。
 http.505.reason=HTTP 版本不支持

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=1847236&r1=1847235&r2=1847236&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
 Fri Nov 23 09:44:51 2018
@@ -23,4 +23,5 @@ jarResource.getUrlFail=无法ç¡�
 
 standardRoot.checkStateNotStarted=如果当前未启动资源，则可能无
法访问这些资源
 standardRoot.createUnknownType=无
法为未知类型[{0}]创建WebResourceSet。
+standardRoot.noContext=尚未为WebResourceRoot配置上下文
 standardRoot.startInvalidMain=指定的主资源集 [{0}] 无效

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=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties Fri Nov 
23 09:44:51 2018
@@ -17,6 +17,7 @@ abstractConnectionHandler.ioexception.de
 
 abstractProcessor.hostInvalid=[{0}] 是无效主机
 
abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
+abstractProcessor.socket.ssl=获取SSL属性异常
 
 abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时
 abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]

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=1847236&r1=1847235&r2=1847236&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 Fri 
Nov 23 09:44:51 2018
@@ -16,4 +16,6 @@
 ajpmessage.null=不能赋空值
 ajpmessage.overflow=在缓冲区[{1}]位置添加
[{0}]字节时发生溢出错误
 
+ajpprocessor.header.error=头部信息解析失败
+
 ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议é…
ç½®è¢«å¿½ç•¥ã€‚

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 http11processor.header.parse=解析 HTTP 请求 header 错误
+http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。
 http11processor.request.invalidUserInfo=HTTP 请求包含带有无效 userinfo 
的绝对 URI
 http11processor.request.prepare=准备请求时出错
 http11processor.request.process=错误的处理请求

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -15,5 +15,7 @@
 
 chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
 chunkedInputFilter.invalidCrlfNoCR=无
效的行尾结束符序列(LF前缺少CR)
+chunkedInputFilter.maxExtension=超过最大扩展数
+chunkedInputFilter.maxTrailer=超过最大数
 
 inputFilter.maxSwallow=最大吞咽数据大小超出异常

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=1847236&r1=1847235&r2=1847236&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 
Nov 23 09:44:51 2018
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractStream.windowSizeInc=连接 [{0}], 流 [{1}], 增加
流量控制窗口[{2}] 到 [{3}]
+
 
connectionPrefaceParser.mismatch=请求了新的远程流ID[{0}]，但所有远程流都å¿
…须使用奇数标识符。
 
 connectionSettings.debug=连接[{0}]，参数类型[{1}]设置为[{2}]
@@ -20,6 +22,12 @@ connectionSettings.headerTableSizeLimit=
 
 hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因
为它超出了允许的0到255范围。
 
+hpackdecoder.tableSizeUpdateNotAtStart=任何表大小的更新都必
须在头块开始时发送。
+
+http2Parser.headers.wrongStream=连接[{0}], 
头部信息对于流[{1}]正在进行但对于流[{2}]的一帧已经收到了。
+http2Parser.nonZeroPadding=连接[{0}]，流[{1}]，非零填充
+http2Parser.processFrameData.window=连接[{0}]，客户端发送的数据比流窗口å
…è®¸çš„多
+http2Parser.processFramePriority.invalidPayloadSize=以[{0}]无
效的有效负载大小接收的优先级帧（应该是5）
 
http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都å¿
…须使用奇数标识符\n\
 \n
 
@@ -27,6 +35,7 @@ stream.inputBuffer.reset=流.重ç
 
 streamProcessor.service.error=请求处理期间出错
 
+upgradeHandler.ioerror=连接[{0}]
 upgradeHandler.pingFailed=对客户端发送ping 链接失败.
 upgradeHandler.socketCloseFailed=关闭 socket 错误
 upgradeHandler.stream.even=\ 
请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数æ 
‡è¯†ç¬¦\n\

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -18,8 +18,10 @@ jasper.error.emptybodycontent.nonempty=�
 jsp.error.attempt_to_clear_flushed_buffer=错误：尝试清
空已刷新的缓冲区
 jsp.error.attribute.deferredmix=不能在同一属性值中同时使用 ${} 
和 #{} EL 表达式
 jsp.error.attribute.noequal=期望的符号是等号
+jsp.error.attribute.noescape=属性值[{0}]引用[{1}]，在值内使用时必
须被转义。
 jsp.error.attribute.nowhitespace=JSP 规范要求一个属性名字前有空格
 jsp.error.bad.scratch.dir=你指定的 scratchDir：[{0}] 不可用。
+jsp.error.beans.noproperty=在[{1}]类型bean中找不到任何有å…
³å±žæ€§[{0}]的信息
 jsp.error.compiler=没有可用的Java编译器
 jsp.error.corresponding.servlet=生成的servlet错误:\n\
 \n
@@ -30,6 +32,7 @@ jsp.error.fallback.invalidUse=jsp:fallba
 jsp.error.file.cannot.read=无法读取文件 [{0}]
 jsp.error.file.not.found=文.件[{0}] 未找到
 jsp.error.file.not.registered=文件[{0}] 不存在
+jsp.error.include.exception=无法包含[{0}]
 jsp.error.include.tag=无效的jsp:include标签
 jsp.error.internal.filenotfound=内部错误：找不到文件 [{0}]
 jsp.error.internal.tldinit=无法初始化 TldLocationsCache: [{0}]
@@ -38,11 +41,15 @@ jsp.error.invalid.version=为标ç
 jsp.error.ise_on_clear=当缓存大小等于0时调用clear()函数是非法的
 jsp.error.jspbody.required=如果使用 jsp:attribute，则必须使用 
jsp:body 为 [{0}] 指定标记正文。
 jsp.error.jspelement.missing.name=XML强制性约束：属性name缺失。
+jsp.error.jspoutput.doctypenamesystem=&lt;jsp:output&gt;: 
'doctype-root-element' 和 'doctype-system' 必须一起出现
 jsp.error.jsproot.version.invalid=版本号 [{0}] 无效，版本号必
须是"1.2"、"2.0"、"2.1"、"2.2"、"2.3"中的一个
 jsp.error.lastModified=无法确定文件 [{0}] 的最后修改日期
+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\
 请在对应上下文Context的servlets.properties文件中添加
"jsp.initparams=scratchdir=<dir-name>"。
 jsp.error.no.scriptlets=脚本( &lt;%!, &lt;jsp:declaration, &lt;%=, 
&lt;jsp:expression, &lt;%, &lt;jsp:scriptlet )不允许出现在这里
@@ -50,16 +57,25 @@ jsp.error.noFunction=无法使�
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
 jsp.error.outputfolder=无输出目录
 jsp.error.overflow=错误：JSP缓冲区溢出
+jsp.error.page.conflict.errorpage=页指令：不同值的多次出现“errorPage”的非法值（旧:[{0}],新:[{1}]）
+jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的值æ—
 æ•ˆ
+jsp.error.page.invalid.info=页指令：信息的值无效
+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.parse.xml=无法解析 XML 文件 [{0}]
 jsp.error.parse.xml.invalidPublicId=无效的 PUBLIC ID: [{0}]
 jsp.error.plugin.wrongRootElement=[{0}] 中的根元素的名称与 [{1}] 
的不同
+jsp.error.prolog_pagedir_encoding_mismatch=指定在XML语言[{0}]的网页编ç
 æ˜¯ä¸åŒäºŽæŒ‡å®šåœ¨ç½‘页的指令[{1}]。
 jsp.error.quotes.unterminated=未终结的引号
 jsp.error.scripting.variable.missing_name=无
法从属性[{0}]确定脚本变量名称
 jsp.error.servlet.invalid.method=JSP 只允许 GET、POST 或 HEAD。Jasper 
还允许 OPTIONS
+jsp.error.simpletag.badbodycontent=对于一下简单的æ 
‡è®°ç¬¦ï¼Œç”¨äºŽç±»[{0}]的标记描述符指定了一个无效的body内
容（JSP）中
 jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 
行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
+jsp.error.tag.invalid.trimdirectivewhitespaces=TAG指令：trimDirectiveWhitespaces的值æ—
 æ•ˆ
 jsp.error.tagfile.nameFrom.badAttribute=\n\
 \ 属性指令（在行[{1}]中声明并且å…
¶name属性为[{0}]，此name-from-attribute属性的值）必
须是java.lang.String类型，是“required”而不是一个“rtexprvalue”。
 jsp.error.taglibDirective.absUriCannotBeResolved=无
法在web.xml或使用此应用程序部署的jar文件中解析绝对uri：[{0}]
@@ -78,15 +94,19 @@ jsp.error.variable.either.name=必é�
 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_queue_update=在上下文[{1}]队列中更新路径为[{0}]的JSP
+jsp.message.jsp_removed_excess=从上下文[{1}]的队列中移除额外在路径[{0}]中JSP，
 jsp.tldCache.noTldSummary=至少有一个JAR被扫描用于TLD但尚未包
含TLD。 
为此记录器启用调试日志记录，以获取已扫描但未在å…
¶ä¸­æ‰¾åˆ°TLD的完整JAR列表。 
在扫描期间跳过不需要的JAR可以缩短启动时间和JSP编译时间。
 jsp.tldCache.tldInDir=在目录 [{0}]中找到了TLD文件。
 jsp.warning.compiler.classfile.delete.fail.unknown=删
除生成的class文件失败
+jsp.warning.dumpSmap=警告：初始化堆内存的值无
效。将使用“false”的默认值
 jsp.warning.enablePooling=警告：initParam enablePooling的值无
效。将使用默认值“true”
+jsp.warning.fork=警告：initParam的值无
效。将使用“true”的默认值
 jsp.warning.unknown.element.in.attribute=属性中的未知元素 [{0}]
 jsp.warning.unknown.element.in.tag=标签中的未知元素 [{0}]
 jsp.warning.unknown.element.in.tagfile=标签文件中的未知元素 [{0}]
@@ -133,6 +153,7 @@ jsp.文件在哪\n\
 \    -target <version>     设置-target.参数到编译器(默认1.8)\n\
 \    -threadCount <count>  编译使用的线程数.\n\
 \                          ("2.0C" 意味着每个内核有两个线程)
+jspc.webfrg.footer=</web-fragment>
 jspc.webfrg.header=<?xml version="1.0" encoding="{0}"?>\n\
 <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"\n\
 \              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
@@ -145,12 +166,16 @@ jspc.webfrg.header=<?xml version="1.0" e
 <!--\n\
 由 Apache Tomcat JspC 自动生成。\n\
 -->
+jspc.webinc.footer=<!--\n\
+由Apache Tomcat JSPC自动创建的内容结束。\n\
+-->
 jspc.webinc.insertEnd=<!-- JSPC servlet 映射结束 -->
 jspc.webinc.insertStart=<!-- JSPC servlet 映射开始 -->
 jspc.webxml.footer=</web-app>\n\
 \n
 
 org.apache.jasper.compiler.TldCache.servletContextNull=提供的 
ServletContext 为 null
+org.apache.jasper.servlet.TldScanner.webxmlAdd=从资源路径[{0} ]加
载URI[{1}]的TLD
 org.apache.jasper.servlet.TldScanner.webxmlFailPathDoesNotExist=无
法使用路径 [{0}] 和 URI [{1}] 处理TLD。指定的路径不存在。
 
 xmlParser.skipBomFail=解析XML输入流时，跳过BOM失败。

Modified: tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties Fri Nov 
23 09:44:51 2018
@@ -16,3 +16,4 @@
 contextBindings.unknownContext=未知.上下文名:[{0}]
 
 namingContext.contextExpected=上下文Context未绑定名称name
+namingContext.failResolvingReference=解析引用时意外异常

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -16,3 +16,5 @@
 poolableConnection.validate.fastFail=此连接上预先抛出了致命的 
SQLException。
 
 poolingDataSource.factoryConfig=PoolableConnectionFactory 未连接到连接池
。请调用 setPool() 修复此配置。
+
+swallowedExceptionLogger.onSwallowedException=一个内部对象池
吞并了一个异常。

Modified: tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties Fri 
Nov 23 09:44:51 2018
@@ -15,6 +15,7 @@
 
 diagnostics.threadDumpTitle=打印全部线程
 diagnostics.vmInfoClassCompilation=:)class汇编
+diagnostics.vmInfoClassLoading=类加载中
 diagnostics.vmInfoLogger=日志记录器（Logger）信息
 diagnostics.vmInfoOs=操作系统信息
 diagnostics.vmInfoRuntime=运行时信息

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -20,6 +20,8 @@ webRuleSet.postconstruct.duplicate=class
 
 webXml.duplicateFilter=重复的过滤器名称 [{0}]
 webXml.duplicateServletMapping=名为 [{0}]和 [{1}] 的servlet不能映
射为一个url模式(url-pattern) [{2}]
+webXml.mergeConflictDisplayName=显示名称在多个片段中被定义，这些片段åŒ
…含不同的值，包括位于[{1}]的[{0}]的片段。
 webXml.mergeConflictSessionCookieName=会话cookie名称在多个å…
·æœ‰ä¸åŒå€¼çš„片段中定义不一致，包括位于 [{1}] 的片段 [{0}]
+webXml.mergeConflictSessionTimeout=会话超
时以不同值的多个片段不一致地定义，这些片段包
括位于[{1}]的具有名称[{0}]的片段。
 
webXml.mergeConflictSessionTrackingMode=会话跟踪模式在多个片段中定义不一致，åŒ
…括位于[{1}]的名称为[{0}]的片段
 webXml.version.unknown=未知版本字符串 [{0}]。将使用默认版本。

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 cookies.invalidCookieToken=Cookie：cookie无效。值不是令牌或引用值
+cookies.invalidSpecial=Cookies：未知特殊的Cookie
 
 parameters.copyFail=无
法创建以调试日志记录为目的的原始参数值的副本
 parameters.decodeFail.debug=字符解码失败.参数 [{0}]和值 
[{1}]被忽略

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=1847236&r1=1847235&r2=1847236&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
 Fri Nov 23 09:44:51 2018
@@ -25,6 +25,8 @@ http.invalidCharacterDomain.afterPeriod=
 http.invalidCharacterDomain.atEnd=字符 [{0}] 在域名末尾无效。
 http.invalidCharacterDomain.atStart=字符 [{0}] 在域名开头无效。
 http.invalidHextet=hextet无效。 hextet必须包含4个或更少的十å…
­è¿›åˆ¶å­—符。
+http.invalidLeadingZero=非零的IPv4字符可能不包含前导零。
+http.invalidOctet=无效字符[{0}].IPv4字符的有效范围为0～255。
 http.singleColonEnd=IPv6地址不能以单个“.”结尾。
 
http.singleColonStart=一个IPv6地址也许不是以单个冒号":"开头的。
 http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 channel.nio.ssl.closing=频道处于正在关闭(closing)的状态
+channel.nio.ssl.foundHttp=找到一个明文HTTP请求，它应该是一个加
密的TLS连接
 channel.nio.ssl.invalidCloseState=无效的å…
³é—­çŠ¶æ€ï¼Œä¸ä¼šå‘送网络数据。
 channel.nio.ssl.sniHostName=连接 [{0}]
 channel.nio.ssl.timeoutDuringHandshake=握手期间超时。
@@ -24,11 +25,14 @@ endpoint.apr.applyConf=正将OpenS
 endpoint.apr.checkConf=检查配置OpenSSLConf
 endpoint.apr.errApplyConf=不能对SSL上下文应用OpenSSLConf  配置
 endpoint.apr.errMakeConf=无法创建OpenSSLConf 上下文
+endpoint.apr.pollAddInvalid=无效企图向一个轮询器中添加
一个套接字[{0}]
 endpoint.debug.channelCloseFail=关闭频道失败
 endpoint.debug.destroySocket=将销毁socket [{0}]
 endpoint.debug.socket=socket [{0}]
 endpoint.debug.socketCloseFail=关闭 socket 失败
 endpoint.debug.unlock.localNone=无法解除 [{0}] 的接受器，因
为本地地址不可用
+endpoint.err.close=抓住异常试图关闭socket
+endpoint.err.unexpected=处理套接字时意外错误
 endpoint.init.notavail=APR.不可用
 endpoint.invalidJmxNameSslHostCert=对于SSLHostConfigCertificateå…
³è”的主机[{0}]和证书类型[{1}]，无法生成有效的XML对象名称
 endpoint.nio.stopLatchAwaitInterrupted=在等待
轮询器停止时，该线程被中断

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -20,3 +20,4 @@ jsse.pemParseError=无法从 [{
 
 jsseSupport.certTranslationError=错误的转换证书[{0}]
 jsseSupport.clientCertError=尝试从客户端获取证书时出错
+jsseSupport.noCertWant=无需发送客户端证书

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -15,6 +15,7 @@
 
 engine.ciphersFailure=获取密码列表失败
 engine.emptyCipherSuite=空密码套件
+engine.engineClosed=引擎已经关闭
 engine.handshakeFailure=握手失败：[{0}]
 engine.noSession=无效的SSL会话ID
 engine.openSSLError=OpenSSL 错误：[{0}] 信息: [{1}]
@@ -28,5 +29,6 @@ openssl.errMakeConf=无法创å
 openssl.trustManagerMissing=没有找到.信任管理者
 
 opensslconf.checkFailed=检查OpenSSLConf时失败。
+opensslconf.finishFailed=OpenSSLConf 配置失败结果为 [{0}]
 
 sessionContext.nullTicketKeys=Null keys

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -16,6 +16,7 @@
 jarScan.classPath.badEntry=class路径[{0}]不能被转化成URL
 jarScan.classloaderFail=在多级类加载器中扫描[{0}]失败
 jarScan.classloaderJarNoScan=跳过classpath路径[{0}]下的jar包扫描。
+jarScan.classloaderStart=在类加载器层次结构中扫描JAR
 jarScan.jarUrlStart=正在扫描URL [{0}] 上的JAR文件
 jarScan.webinfclassesFail=无法扫描/WEB-INF/classes
 jarScan.webinflibJarNoScan=没有扫描到/WEB-INF/lib目录下的JAR [{0}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties 
Fri Nov 23 09:44:51 2018
@@ -13,17 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+asyncChannelWrapperSecure.eof=意外的流结尾
+
 caseInsensitiveKeyMap.nullKey=不允许 Key 是 Null
 
+perMessageDeflate.deflateFailed=无法压缩这个WebSocket压缩结构
+
 util.notToken=一个非法的扩展参数被指定为名称[{0}]和值[{0}]
+util.unknownDecoderType=无法识别该解码器类型[{0}]
 
+wsFrame.byteToLongFail=提供了太多字节([{0}])，转换成一个长的字节。
 wsFrame.closed=在一个关闭的控制帧后受到了一个新的帧.
+wsFrame.controlFragmented=接收到分段的控制帧，但控制帧可能不被分割。
+wsFrame.controlNoFin=发送一个没有设置的控制帧。控制帧不å…
è®¸ä½¿ç”¨è¿žç»­å¸§ã€‚
 wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], 
OpCode [{2}], payload 长度 [{3}]
 wsFrame.sessionClosed=无法处理客户端数据，因为会话已被关闭
 wsFrame.wrongRsv=对于具有opCode 
[{1}]的消息，客户端帧将保留位设置为[{0}]，此端点不支持
 
 wsHandshakeRequest.invalidUri=字符串  [{0}] 
不能用来组成一个有效的URI
 
+wsRemoteEndpoint.acquireTimeout=当前消息没有在指定的超时内完å…
¨å‘送
+wsRemoteEndpoint.changeType=发送分段消息时，所有片段必
须是相同类型的。
 wsRemoteEndpoint.closed=由于 WebSocket session å·²å…
³é—­ï¼Œæ¶ˆæ¯å°†ä¸ä¼šè¢«å‘送
 wsRemoteEndpoint.closedDuringMessage=因为 WebSocket session 被å…
³é—­ï¼Œæ¶ˆæ¯çš„剩余部分将不会被送达
 wsRemoteEndpoint.flushOnCloseFailed=会话å…
³é—­åŽä»ç„¶å¯ç”¨æ‰¹å¤„理消息。无法刷新剩余的批量消息

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=1847236&r1=1847235&r2=1847236&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 Nov 23 09:44:51 2018
@@ -17,4 +17,5 @@ pojoEndpointServer.getPojoInstanceFail=�
 
 pojoMessageHandlerWhole.decodeIoFail=解码消息时出现IO错误
 
+pojoMethodMapping.duplicateLastParam=用OnMessage注释的类[{1}]的方法[{0}]上存在多个布尔参数（最后的）
 pojoMethodMapping.invalidDecoder=这个特定类型的解码器[{0}]无
法被实例化

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_zh_CN.properties
 Fri Nov 23 09:44:51 2018
@@ -21,3 +21,4 @@ upgradeUtil.incompatibleRsv=指定
 uriTemplate.invalidPath=路径 [{0}] 无效。
 
 wsFrameServer.bytesRead=将[{0}]个字节读入输å…
¥ç¼“冲区，准备进行处理
+wsFrameServer.onDataAvailable=进入方法

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847236&r1=1847235&r2=1847236&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 23 09:44:51 2018
@@ -178,8 +178,8 @@
         Tomcat. Includes contributions from Darren Luo, syseal, Winsonzhao,
         袁宇杰, Lanranzi, ZhangJieWen, Jerry, yinzhili001, 安柏诚, 
shawn, lavender,
         Zheng Feng, zengwc, RichardHo, mm, gingshi huang, Bob, geekwang, zheng,
-        Deanzhg, Tianfengjingjing, Panblack, oking, Dave Newman, Cnfnss, Jim Ma
-        and 852394875. (markt)
+        Deanzhg, Tianfengjingjing, Panblack, oking, Dave Newman, Cnfnss, Jim 
Ma,
+        852394875 and huxing. (markt)
       </add>
       <add>
         Add Korean translations to Apache Tomcat. Includes contributions from

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=1847236&r1=1847235&r2=1847236&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 
Fri Nov 23 09:44:51 2018
@@ -23,6 +23,7 @@ requestheader.title=请求 Header
 requestinfo.label.method=方法：
 requestinfo.label.protocol=协议：
 requestinfo.label.remoteaddr=远程地址：
+requestinfo.title=请求信息范例
 
 requestparams.firstname=姓：
 requestparams.no-params=没有参数，请输入一些



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

Reply via email to