svn commit: r1847047 [1/2] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catali...

[ma...@apache.org]

Author: markt
Date: Tue Nov 20 19:10:05 2018
New Revision: 1847047

URL: http://svn.apache.org/viewvc?rev=1847047&view=rev
Log:
Import updated Simplified Chinese translations from POEditor

Modified:
    tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties
    tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties
    tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
    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/filters/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/mapper/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/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/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/http11/upgrade/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/util/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/buf/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/server/LocalStrings_zh_CN.properties
    tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/javax/el/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+beanNameELResolver.beanReadOnly=名称为[{0}]的bean只读
+
 elProcessor.defineFunctionInvalidClass=类[{0}]不是公共的
 elProcessor.defineFunctionInvalidMethod=类[{1}]的方法[{0}]不是公共静态方法
 elProcessor.defineFunctionInvalidParameterList=类[{2}]的方法[{1}]的参数列表[{0}]无效

Modified: tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+err.not_iso8859_1=不是ISO 8859-1字符：[{0}]
+
+httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
+
 httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
 
 value.true=true

Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -20,3 +20,4 @@ http.method_delete_not_supported=æ­¤U
 http.method_get_not_supported=此URL不支持Http方法GET
 http.method_not_implemented=这个servlet没有为这个URI实现方法[{0}]
 http.method_post_not_supported=此URL不支持Http方法POST
+http.method_put_not_supported=此URL不支持HTTP方法PUT

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,10 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+authenticator.certificates=此请求中没有客户端证书链
+authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0} 更改为 [{1}]
+authenticator.check.found=已通过身份验证 [{0}]
+authenticator.check.sso=未经过身份验证但找到了SSO会话ID [{0}]。尝试重新验证。
+authenticator.formlogin=对表单登录页的直接引用无效
 authenticator.jaspicCleanSubjectFail=清除 JASPIC 主题失败
+authenticator.jaspicSecureResponseFail=在JASPIC处理期间无法保证响应
 authenticator.jaspicServerAuthContextFail=失败的获取一个JASPIC  ServerAuthContext 实例
+authenticator.loginFail=登录失败
+authenticator.manager=初始化信任管理器异常
+authenticator.noAuthHeader=客户端未发送授权请求头
+authenticator.notContext=配置错误:必须被附属于一个上下文
+authenticator.requestBodyTooBig=请求正文太大，无法在身份验证过程中进行缓存
 authenticator.sessionExpired=已超出登录过程所允许的时间。 如果您希望继续，则必须单击两次后退并重新单击您请求的链接或先关闭然后重新打开浏览器
+authenticator.tomcatPrincipalLogoutFail=使用TomcatPrincipal实例注销失败
+authenticator.unauthorized=无法使用提供的凭据进行身份验证
 
+basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
+
+digestAuthenticator.cacheRemove=已从客户端 nonce 缓存中删除有效条目，以便为新条目腾出空间。重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增加cnonceCacheSize。此类型的进一步警告将被抑制5分钟。
+
+singleSignOn.debug.cookieCheck=SSO检查SSO cookie
+singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie
 singleSignOn.debug.principalFound=SSO 找到了带着认证类型的缓存代理
 singleSignOn.debug.removeSession=SSO 从 SSO session [{1}] 中删除应用程序会话 [{0}]
 singleSignOn.sessionExpire.hostNotFound=因为 Host 丢失，SSO 无法使 session [{0}] 失效

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -14,5 +14,12 @@
 # limitations under the License.
 
 authConfigFactoryImpl.zeroLengthAppContext=:)应用上下文名称的长度为0是无效的
+authConfigFactoryImpl.zeroLengthMessageLayer=零长度的消息层名称是无效的
 
+jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
+
+persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
 persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
+persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+
+simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -14,16 +14,25 @@
 # limitations under the License.
 
 coyoteAdapter.checkRecycled.response=遇到非回收的相应并强行回收。
+coyoteAdapter.debug=变量[{0}]的值为[{1}]。
 coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数，url中的该地址参数将被忽略
 
+coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别，Connector 将继续使用 [{1}]
 coyoteConnector.invalidPort=连接器不能启动，因为指定的端口 [{0}]无效
 coyoteConnector.protocolHandlerInstantiationFailed=协议处理程序实例化失败
 coyoteConnector.protocolHandlerPauseFailed=协议处理程序暂停失败
 coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
 
+coyoteInputStream.nbNotready=在非阻塞模式下，只有之前的读数据完成，并且isReady()方法返回true，你才可以使用 ServletInputStream 读取数据
+
 coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。
 coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
 coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
 coyoteRequest.noMultipartConfig=由于没有提供multi-part配置，无法处理parts
+coyoteRequest.setAttribute.namenull=不能在一个空的名字上调用setAttribute
+
+coyoteResponse.encoding.invalid=JRE无法识别编码[{0}]
 
 requestFacade.nullRequest=请求对象已被回收，不再与此facade关联
+
+responseFacade.nullResponse=响应对象已被回收，不再与此外观关联

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,14 +15,21 @@
 
 applicationContext.addJspFile.iae=JSP 文件 [{0}] 不可用
 applicationContext.addListener.iae.cnfe=无法创建类型为 [{0}] 的实例
+applicationContext.addListener.iae.wrongType=指定的类型[{0}]不是预期的侦听器类型之一
+applicationContext.invalidServletName=由于servlet名称[{0}]无效，无法添加对应servlet的定义。
 applicationContext.mapping.error=映射中.的错误
 applicationContext.setAttribute.namenull=Name 不能为 null
 applicationContext.setSessionTracking.iae.ssl=为上下文 [{0}] 请求的 session 跟踪模式包括 SSL 和至少一种其他模式。 SSL可能未配置其他模式。
+applicationContext.setSessionTracking.ise=当上下文正在运行，无法设置上下文[{0}]的会话跟踪模式
+
+applicationDispatcher.specViolation.response=原始的ServletResponse或包装后的ServletResponse未传递给RequestDispatcher，原因：违反了SRV.8.2和SRV.14.2.5.1\n\
+\n
 
 applicationFilterRegistration.nullInitParams=由于name和(或)value为null，无法为过滤器设置初始化参数。name为 [{0}]，value为 [{1}]
 
 applicationPushBuilder.methodNotToken=HTTP方法必须是令牌(token)，但 [{0}] 包含非令牌字符
 
+aprListener.aprInitError=基于APR的本地库加载失败.错误报告为[{0}]
 aprListener.initializingFIPS=初始化FIPS模式...
 aprListener.tooLateForSSLRandomSeed=无法设置 SSLRandomSeed：SSL已经初始化
 
@@ -37,22 +44,39 @@ defaultInstanceManager.restrictedListene
 filterChain.filter=Filter 执行抛出一个异常
 
 naming.addEnvEntry=添加环境条目 [{0}]
+naming.addResourceEnvRef=添加资源环境引用 [{0}]
+naming.invalidEnvEntryType=环境条目[{0}]没有一个有效哦的类型
 naming.wsdlFailed=未找到 wsdl 文件：[{0}]
 
+standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
+standardContext.errorPage.required=ErrorPage不能为null
 standardContext.errorPage.warning=警告：在Servlet 2.4中，错误页位置 [{0}] 必须以"/"开头
 standardContext.filterMap.either=过滤器映射必须指定 <url-pattern> 或 <servlet-name>
+standardContext.filterMap.pattern=过滤器映射中的<url-pattern> [{0}] 无效
 standardContext.filterStart=启动过滤器异常
 standardContext.invalidWrapperClass=[{0}] 不是StandardWrapper的子类
+standardContext.isUnavailable=此应用程序目前不可用
 standardContext.listenerStart=异常将上下文初始化事件发送到类的侦听器实例.[{0}]
 standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
 standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
+standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必须以''/''开头
+standardContext.managerFail=会话管理器无法启动
+standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
 standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 方法定义重复
+standardContext.resourcesStop=停止静态资源时出错
 standardContext.securityConstraint.mixHttpMethod=在相同的web资源集合中不允许混用: <http-method> 和 <http-method-omission>
 standardContext.securityConstraint.pattern=安全约束中的<url-pattern> [{0}] 无效
 standardContext.servletFail=启动时无法加载一个或多个Servlet。 全部的详细信息可在相应的容器日志文件中找到
+standardContext.unknownCookieEncoding=为setCookieEncoding(String)指定了未知编码[{0}]，因此将使用默认的UTF-8。
 
 standardHost.noContext=没有配置上下文来处理此请求
 
 standardServer.accept.timeout=在调用accept()方法之后，侦听shutdown命令的套接字经历了意外的超时[{0}]毫秒。 这是bug 56684的一个例子？
 
+standardWrapper.destroyInstance=servlet[{0}]实例管理销毁(destroy) 抛出异常
+standardWrapper.isUnavailable=Servlet [{0}]当前不可用。
+standardWrapper.notChild=Wrapper容器内部不允许有子容器。
+standardWrapper.notFound=Servlet [{0}] 不可用
 standardWrapper.unloading=无法分配servlet [{0}]，因为它没有被加载
+
+threadLocalLeakPreventionListener.containerEvent.error=异常处理容器事件[{0}]

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,6 +15,8 @@
 
 corsFilter.invalidPreflightMaxAge=无法解析 preflightMaxAge
 corsFilter.nullRequest=HttpServletRequest 对象为空
+corsFilter.nullRequestType=CORSRequestType对象为空(null)
+corsFilter.onlyHttp=CORS不支持非HTTP请求或响应
 
 csrfPrevention.invalidRandomClass=不能使用class [{0}]创建随机源.
 

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -20,5 +20,9 @@ farmWarDeployer.msgIoe=无法è¯�
 farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
 farmWarDeployer.removeLocalFail=无法移除WAR文件
 farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
+farmWarDeployer.undeployEnd=从[{0}]取消部署完成。
 
+fileMessageFactory.deleteFail=无法删除 [{0}]
+
+warWatcher.cantListWatchDir=无法列出WatchDir文件夹 [{0}] 中的文件：检查该路径是否为目录且应用具有读取权限。
 warWatcher.checkingWar=检查 WAR 文件 [{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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,9 +15,18 @@
 
 backupManager.noCluster=没有与此上下文关联的集群：[{0}]
 
+deltaManager.createSession.newSession=用id[{0}]创建一个扩展会话(DeltaSession)，总数为 [{1}]
 deltaManager.foundMasterMember=复制主master 成员在上下文中被发现.\n
 deltaManager.loading.cnfe=加载持久化会话 [{0}] 时出现ClassNotFoundException
 deltaManager.loading.ioe=加载持久 session 时出现 IOException：[{0}]
+deltaManager.receiveMessage.expired=管理器[{0}]: 接收到的会话 [{1}] 已过期。
+deltaManager.receiveMessage.unloadingBegin=管理器[{0}]: 开始卸载会话
+deltaManager.sendMessage.newSession=\ 管理器 [{0}] 发送新的会话 [{1}]
+deltaManager.unableSerializeSessionID=无法序列化会话ID [{0}]
 deltaManager.unloading.ioe=当保存永久回话:[{0}] 时，抛出 IOException
 
+deltaRequest.removeUnable=不能移除元素
+deltaRequest.showPrincipal=Principal [{0}] 和session [{1}]产生关联。
+deltaRequest.wrongPrincipalClass=ClusterManager仅支持GenericPrincipal。 你的Realm使用的Principal类为[{0}]。
+
 jvmRoute.notFoundManager=没有在 [{0}] 找到Cluster Manager

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -16,5 +16,7 @@
 ReplicationValve.filter.failure=无法编译 filter = [{0}]
 ReplicationValve.session.found=上下文[{0}]：找到会话[{1}]但它不是ClusterSession。
 
+simpleTcpCluster.clustermanager.notImplement=连接器 [{0}] 不能继承 ClusterManager，除非集群被停止。
 simpleTcpCluster.member.addFailed=无法连接到复制系统。
+simpleTcpCluster.member.disappeared=收到成员消失:[{0}]
 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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -20,8 +20,12 @@ webappClassLoader.clearJdbc=Web应ç�
 webappClassLoader.clearReferencesResourceBundlesCount=从Web应用[{1}]的缓存中删除了[{0}] ResourceBundle引用
 webappClassLoader.clearReferencesResourceBundlesFail=无法清除Web应用程序 [{0}] 的ResourceBundle引用
 webappClassLoader.jarsRemoved=一个或多个 JAR 已被从 Web 应用程序 [{0}] 中删除
+webappClassLoader.jdbcRemoveFailed=Web应用程序 [{0}] 的JDBC驱动程序注销失败
 webappClassLoader.readError=资源读取错误:不能加载 [{0}].
+webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
 webappClassLoader.validationErrorJarPath=无法验证名称为 [{0}] 的 JAR 条目
 webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
 
 webappLoader.copyFailure=无法复制资源
+webappLoader.mkdirFailure=无法创建目标目录以复制资源
+webappLoader.setContext.ise=当加载器启动的时候设置上下文是不被允许的

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -16,17 +16,24 @@
 htmlManagerServlet.appsAvailable=运行中
 htmlManagerServlet.appsName=显示.名称
 htmlManagerServlet.appsPath=路径
+htmlManagerServlet.appsReload=重新加载
 htmlManagerServlet.appsSessions=会话
 htmlManagerServlet.appsTasks=命令
+htmlManagerServlet.configReloadButton=重复读
 htmlManagerServlet.configSslReloadTitle=重新读取 TLS 配置文件
 htmlManagerServlet.connectorStateBytesSent=发送.字节:
 htmlManagerServlet.connectorStateProcessingTime=处理时间：
 htmlManagerServlet.connectorStateTableTitleRequest=请求
+htmlManagerServlet.connectorStateTableTitleTime=时间
 htmlManagerServlet.connectorStateTableTitleVHost=虚拟主机
+htmlManagerServlet.connectorStateThreadCount=当前线程数：
 htmlManagerServlet.deployButton=:)部署
+htmlManagerServlet.deployServer=服务器上.部署的目录或WAR文件
 htmlManagerServlet.deployTitle=部署
 htmlManagerServlet.deployUploadNoFile=失败 - 文件上传失败，没有文件
-htmlManagerServlet.diagnosticsLeak=检查Web应用程序是否在停止，重新加载或取消部署时导致内存泄漏
+htmlManagerServlet.deployUploadWarExists=失败 - War文件 [{0}] 已存在于服务器上
+htmlManagerServlet.deployWar=WAR文件或文件夹路径：
+htmlManagerServlet.diagnosticsLeak=检查Web应用程序是否在停止、重新加载或取消部署时导致内存泄漏
 htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
 htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
 htmlManagerServlet.diagnosticsTitle=诊断
@@ -37,21 +44,27 @@ htmlManagerServlet.jvmTotalMemory=总
 htmlManagerServlet.manager=管理器
 htmlManagerServlet.noManager=-
 htmlManagerServlet.serverHostname=主机名
-htmlManagerServlet.serverIPAddress=IP地址\n
+htmlManagerServlet.serverIPAddress=IP地址
 htmlManagerServlet.serverJVMVersion=JVM.版本
 htmlManagerServlet.serverOSName=OS.名称
 htmlManagerServlet.serverTitle=服务器信息
 htmlManagerServlet.serverVersion=Tomcat.版本
 
 managerServlet.alreadyContext=失败 - 应用程序已存在于路径 [{0}]
+managerServlet.deployFailed=FAIL - 在上下文路径[{0}]下部署应用失败
 managerServlet.deployed=OK - 以应用path [{0}] 部署应用
+managerServlet.findleaksNone=很好 - 没有发现内存泄漏
 managerServlet.mkdirFail=失败 - 无法创建目录 [{0}]
+managerServlet.noCommand=失败 - 未指定命令
 managerServlet.noGlobal=失败 - 没有可用的全局 JNDI 资源
 managerServlet.notSslConnector=不允许SSL连接
 managerServlet.postCommand=失败 - 尝试通过GET请求使用命令[{0}]，但需要POST
 managerServlet.resourcesAll=好的, 列出所有类型的全部资源
+managerServlet.resourcesType=OK-[{0}]类型全局资源列入清单
 managerServlet.saveFail=失败 - 配置保存失败：[{0}]
 managerServlet.sslConnectorCiphers=OK-Connector/SSL 密码.信息
 managerServlet.sslReloadFail=FAIL - 重新加载TLS配制失败
 managerServlet.trustedCertsNotConfigured=没有为此虚拟主机配置受信任的证书
+managerServlet.undeployed=OK-未部署的应用位于上下文路径[{0}]
 managerServlet.unknownCommand=FAIL - 未知命令 [{0}]
+managerServlet.vminfo=OK - VM信息

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -14,22 +14,32 @@
 # limitations under the License.
 
 hostManagerServlet.addFailed=失败 - 添加主机 [{0}] 失败
+hostManagerServlet.alreadyStarted=失败 - Host[{0}]已经启动。
+hostManagerServlet.configBaseCreateFail=失败 - 无法识别主机[{0}]的基础配置
 hostManagerServlet.listed=OK - 已列出Host
+hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - 无法安装manager.xml
 hostManagerServlet.noCommand=失败 - 未指定命令
+hostManagerServlet.persist=持久化: 正在持久化当前配置
 hostManagerServlet.persistFailed=失败 - 无法持久化配置
+hostManagerServlet.persisted=好的，配置持久化了.
 hostManagerServlet.remove=移除:正在移除主机 [{0}]
 hostManagerServlet.removeFailed=失败 - 无法移除主机 [{0}]
+hostManagerServlet.startFailed=失败 - 无法启动主机 [{0}]
 hostManagerServlet.started=成功 - 主机 [{0}] 已启动
 hostManagerServlet.stopFailed=失败 - 无法停止主机 [{0}]
+hostManagerServlet.stopped=OK - 主机 [{0}] 已停止
 hostManagerServlet.unknownCommand=FAIL - 未知命令 [{0}]
 
 htmlHostManagerServlet.addAutoDeploy=自动.部署
+htmlHostManagerServlet.addCopyXML=拷贝XML
+htmlHostManagerServlet.addDeployOnStartup=启动.部署
 htmlHostManagerServlet.addHost=主机
 htmlHostManagerServlet.addManager=管理 App
 htmlHostManagerServlet.addTitle=添加.虚拟主机
 htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
 htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
+htmlHostManagerServlet.hostAliases=主机别名
 htmlHostManagerServlet.hostName=主机名
 htmlHostManagerServlet.hostsPersist=持久化
 htmlHostManagerServlet.hostsRemove=移除
@@ -37,4 +47,7 @@ htmlHostManagerServlet.hostsStop=停�
 htmlHostManagerServlet.manager=主机.管理器
 htmlHostManagerServlet.persistTitle=持久化配置
 htmlHostManagerServlet.serverOSArch=OS 架构
+htmlHostManagerServlet.serverTitle=服务器信息
 htmlHostManagerServlet.title=Tomcat虚拟主机管理员
+
+statusServlet.title=服务器状态

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -14,3 +14,5 @@
 # limitations under the License.
 
 mapper.addHostAlias.success=为虚拟主机 [{1}] 注册了别名 [{0}]
+
+mapperListener.registerWrapper=为服务Service[{2}]在上下文Context[{1}]注册Wrapper[{0}]

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,13 +15,18 @@
 
 combinedRealm.authFail=无法使用域[{1}]对用户[{0}]进行身份验证
 
+dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。
 dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常
 
 jaasCallback.username=返回用户名 [{0}]
 
+jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建
 jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
 
+jndiRealm.authenticateSuccess=用户名[{0}]成功认证
 jndiRealm.cipherSuites=启用 [{0}] 作为 TLS 连接的加密套件。
+jndiRealm.exception=执行认证异常
+jndiRealm.open=打开目录服务器链接异常
 
 lockOutRealm.authLockedUser=尝试对锁定的用户[{0}]进行身份验证
 
@@ -33,6 +38,9 @@ pbeCredentialHandler.invalidKeySpec=æ—
 
 realmBase.authenticateFailure=用户名 [{0}] 认证失败
 realmBase.createUsernameRetriever.ClassCastException=类[{0}] 不是一个X509UsernameRetriever.
+realmBase.digest=对用户凭证摘要发生错误
 realmBase.forbidden=已拒绝访问所请求的资源
 realmBase.hasRoleFailure=用户[{0}]没有角色[{1}]
 realmBase.hasRoleSuccess=用户名[{0}] 有角色[{1}]
+
+userDatabaseRealm.noDatabase=未找到key[{0}]对应的UserDatabase组件。

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -17,5 +17,8 @@ cgiServlet.expandFail=在路径
 cgiServlet.find.location=在 [{0}] 查找文件
 cgiServlet.runHeaderReaderFail=I/O 问题关闭请求头读操作
 cgiServlet.runInvalidStatus=无效状态 [{0}]
+cgiServlet.runOutputStreamFail=关闭输出流时发生I/O问题
 
 directory.size=大小
+
+webdavservlet.jaxpfailed=JAXP 初始化失败

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -22,8 +22,14 @@ managerBase.contextNull=使用 Man
 managerBase.createSession.ise=createSession：活跃session过多
 
 persistentManager.storeSizeException=无法确定 session 存储区的会话数，假定存储区为空
+persistentManager.swapIn=在表单存储中,交换会话[{0}]
+
+standardManager.loading.exception=加载持久化会话时发生异常
+standardManager.managerLoad=从持久化存储加载会话发生异常
 
 standardSession.getValueNames.ise=getValueNames：会话已经失效
 standardSession.logoutfail=当回话将过期登出用户异常
+standardSession.notDeserializable=无法反序列化会话 [{1}] 的属性 [{0}]
+standardSession.notSerializable=不能序列化会话[{1}]的属性[{0}]
 standardSession.removeAttribute.ise=删除属性：会话已失效
 standardSession.sessionEvent=会话时间监听抛出异常

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -21,16 +21,26 @@ contextConfig.altDDNotFound=未找
 contextConfig.applicationStart=正在解析应用程序 web.xml 文件 [{0}]
 contextConfig.applicationUrl=无法确定应用程序 web.xml 的URL
 contextConfig.authenticatorConfigured=为方法 [{0}] 配置了验证器
+contextConfig.authenticatorMissing=不能配置一个认证为方法[{0}]
+contextConfig.cce=生命周期事件数据对象[{0}] 不是一个上下文
 contextConfig.contextMissing=缺少 context.xml：[{0}]
 contextConfig.defaultMissing=未找到全局 web.xml
 contextConfig.defaultPosition=发生在 [{0}] 行 [{1}] 列
 contextConfig.fixDocBase=上下文[{0}]的异常修复docBase
+contextConfig.inputStreamWebResource=不能处理注释的Web资源[{0}]
 contextConfig.jndiUrlNotDirContextConn=为URL [{0}] 创建的连接不是DirContextURLConnection
+contextConfig.jspFile.error=JSP文件[{0}]必须以''/'开头。
 contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
 contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class 文件
 contextConfig.role.runas=<run-as> 中使用的安全角色名 [{0}]，未在 <security-role> 中定义
+contextConfig.tomcatWebXmlError=处理 /WEB-INF/tomcat-web.xml 发生错误
 
+engineConfig.cce=生命周期事件数据对象[{0}]不是一个引擎(Engine)
+
+expandWar.copy=错误的拷贝[{0}] to [{1}]
+expandWar.createFailed=无法创建文件夹[{0}]。
 expandWar.deleteFailed=[{0}] 无法被彻底删除。其余残留文件可能会导致问题
+expandWar.deleteOld=发现一个展开的目录[{0}],它的最后修改时间与关联的WAR不一致.它将被删除.
 expandWar.missingJarEntry=无法获得 JarEntry [{0}] 的输入流 - WAR 文件是否已损坏?
 
 hostConfig.deployDir=部署 web 应用程序目录 [{0}]
@@ -44,11 +54,16 @@ tomcat.noContextXml=不能找å
 
 userConfig.database=加载用户数据库异常
 userConfig.deploying=正在部署用户 web 应用程序
+userConfig.error=为用户 [{0}]部署web应用发生错误
 userConfig.start=用户配置：处理开始
 
 versionLoggerListener.catalina.home=CATALINA_HOME:         {0}
 versionLoggerListener.os.arch=结.造:          {0}
 versionLoggerListener.os.version=OS.版本:            {0}
+versionLoggerListener.prop=系统属性:       {0} = {1}
 versionLoggerListener.serverInfo.server.built=Server.构建:          {0}
 versionLoggerListener.serverInfo.server.version=Server.服务器版本:        {0}
 versionLoggerListener.vm.vendor=JVM.供应商:            {0}
+versionLoggerListener.vm.version=JVM 版本:           {0}
+
+webAnnotationSet.invalidInjection=方法资源注入注解无效。

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -15,4 +15,5 @@
 
 channelCoordinator.invalid.startLevel=启动级别无效，有效级别为：SND_RX_SEQ，SND_TX_SEQ，MBR_TX_SEQ，MBR_RX_SEQ
 
+groupChannel.listener.alreadyExist=侦听器已存在：[{0}][{1}]
 groupChannel.warn.noUtilityExecutor=没有公共的executor 被设置时,创建一个

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -32,10 +32,12 @@ gzipInterceptor.report=:)GZip 拦æˆ
 \tRx 未压缩的字节: {10}\n\
 ]
 
+messageDispatchInterceptor.queue.full=异步队列已满，达到 [{0}] 字节的限制，当前：[{1}] 字节
 messageDispatchInterceptor.unableAdd.queue=无法将消息添加到异步队列，队列 bug？
 messageDispatchInterceptor.warning.optionflag=警告！你正在覆盖异步选项标志，这将禁用其它程序可能用到的 Channel.SEND_OPTIONS_ASYNCHRONOUS。
 
 nonBlockingCoordinator.memberAlive.failed=无法执行成员活动检查，猜测成员下线。
+nonBlockingCoordinator.processCoordinationMessage.failed=处理协调消息时出错。 可能是致命的。
 
 staticMembershipInterceptor.no.failureDetector=没有TcpFailureDetector。 自动检测静态成员无法正常工作。 通过在TcpFailureDetector下定义StaticMembershipInterceptor，可以自动检测静态成员。
 staticMembershipInterceptor.no.pingInterceptor=在没有TcpPingInterceptor的情况下，静态成员的健康检查不会正常工作。只有定义了TcpPingInterceptor，才能使健康检查正常进行。

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -19,3 +19,4 @@ replicationStream.conflict=和非�
 
 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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -17,8 +17,11 @@ mcastService.missing.property=McastServi
 
 mcastServiceImpl.invalid.startLevel=无效的启动级别。只接受以下级别：Channel.MBR_RX_SEQ或 Channel.MBR_TX_SEQ
 mcastServiceImpl.send.running=McastService.send已经运行
-mcastServiceImpl.unable.join=无法加入多播组，请确保您的系统已启用多播。
+mcastServiceImpl.unable.join=无法加入多播组，请确保你的系统已启用多播。
 mcastServiceImpl.unableReceive.broadcastMessage=无法接收广播消息。
 
+staticMember.invalid.uuidLength=UUID必须正好是16个字节，而不是：[{0}]
+
 staticMembershipProvider.leftOver.ignored=消息 [{0}] 被忽略。
 staticMembershipProvider.startMembership.noReplies=0响应，可能超时
+staticMembershipProvider.stopMembership.sendFailed=无法发送成员消息

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractStream.CACertUndefined=CA证书文件未定义
 abstractStream.fileNotFound=未找到 CA 证书文件 [{0}]
 abstractStream.trustManagerError=无法为{0}创建信任管理器
 

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractReplicatedMap.broadcast.noReplies=广播收到0回复，可能是超时了。
 abstractReplicatedMap.leftOver.ignored=消息[{0}]被忽略
 abstractReplicatedMap.transferState.noReplies=传输状态，0响应，也许是超时。
+abstractReplicatedMap.unable.get=无法复制 AbstractReplicatedMap.get 操作的数据
 
 lazyReplicatedMap.unableReplicate.proxy=不能复制proxy key:[{0}]到备份:[{1}]. 原因是:[{2}]
 

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+receiverBase.socket.bind=服务器套接字接收器绑定到：[{0}]
 receiverBase.unable.bind=无法绑定套接字端口:{{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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,4 +15,10 @@
 
 bioReceiver.socket.closeFailed=socket.关闭失败
 
+bioReplicationTask.reader.closeFailed=无法关闭reader
+bioReplicationTask.socket.closeFailed=无法关闭套接字
+bioReplicationTask.unable.service=不能服务bio套接字
+
+bioSender.ack.missing=不能读确认表格:[{0}] {1,number,integer}] in {2,number,integer} 毫秒, 失去socket连接, 重试连接.
+bioSender.ack.wrong=在本地端口[{0}：{1，number，integer}]读取10个字节后丢失正确的ACK
 bioSender.send.again=再次发送数据到 [{0}:{1,number,integer}]

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,10 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+nioReceiver.alreadyStarted=ServerSocketChannel已经被启动
 nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。
 nioReceiver.start.fail=无法启动集群接收器
 nioReceiver.threadpool.fail=ThreadPool 无法初始化。 监听器未启动。
 
+nioReplicationTask.process.clusterMsg.failed=处理集群消息失败
+
 nioSender.unknown.state=数据处于未知状态。readyOps = [{0}]
 
 parallelNioSender.send.failed=并行的NIO.发送失败。

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,7 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+memoryUserDatabase.fileClose=关闭 [{0}] 失败
+memoryUserDatabase.fileDelete=无法删除 [{0}]
+memoryUserDatabase.notPersistable=用户数据库不可持久化 - 对目录没有写入权限
 memoryUserDatabase.nullRole=指定的角色名为Null或着长度为0。角色将被忽略，
 memoryUserDatabase.readOnly=用户数据库已被设为只读。修改无法保存
 memoryUserDatabase.reloadError=从更新后的源 [{1}] 重新加载内存用户数据库 [{0}] 时出错
+memoryUserDatabase.renameNew=无法将新文件重命名为 [{0}]
 memoryUserDatabase.renameOld=原文件无法改名为[{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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,8 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-customObjectInputStream.nomatch=类不能匹配合适的表达式，因为类被允许反序列化\n
+customObjectInputStream.nomatch=类不能匹配合适的表达式，因为类被允许反序列化
 
+extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: 请求的拓展[{2}]未找到。
 extensionValidator.web-application-manifest=web 应用程序清单
 
+hexUtil.bad=坏的十六进制数字
+
 introspection.classLoadFailed=加载 class [{0}] 失败
+
+lifecycleBase.initFail=初始化组件[{0}]失败。
+
+netmask.cidrNegative=CIDR [{0}]为负数。
+netmask.invalidAddress=地址 [{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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -16,22 +16,29 @@
 accessLogValve.closeFail=关闭访问日志文件失败
 accessLogValve.invalidLocale=无法将区域设置设为 [{0}]
 accessLogValve.invalidPortType=端口类型 [{0}] 无效，使用服务器（本地）端口
+accessLogValve.openFail=无法打开访问日志文件[{0}]。
 accessLogValve.rotateFail=失败的循环切割访问日志.
 
 errorReportValve.description=描述
+errorReportValve.message=消息
 errorReportValve.rootCauseInLogs=主要问题的全部 stack 信息可以在 server logs 里查看
 errorReportValve.unknownReason=未知的原因
 
 http.401.reason=未经授权的
 http.402.desc=这个状态码时为未来使用预留的.
+http.403.desc=服务器理解该请求但拒绝授权。
+http.403.reason=被禁止
 http.404.reason=Not Found
+http.405.desc=请求行中接收的方法由源服务器知道，但目标资源不支持
 http.407.reason=代理需要认证
 http.412.reason=前置条件失败
 http.413.reason=有效载荷过大
 http.415.reason=不支持的媒体类型
 http.423.reason=已锁定
 http.426.reason=需要升级
+http.428.desc=原始服务器要求请求是有条件的。
 http.429.reason=请求过多
+http.431.reason=请求头的字段太大
 http.502.desc=服务器在充当网关或代理时, 在尝试完成请求时, 从它访问的入站服务器收到无效响应。
 http.503.desc=由于临时过载或计划维护，服务器当前无法处理请求，这可能会在一些延迟后得到缓解。
 http.505.reason=HTTP 版本不支持
@@ -40,3 +47,5 @@ http.510.reason=没有.扩å±�
 http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
 
 remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
+
+requestFilterValve.deny=根据[{1}]配置拒绝[{0}]的请求

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,9 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cache.addFail=无法将位于[{0}]的资源添加到Web应用程序[{1}]的缓存中，因为在清除过期缓存条目后可用空间仍不足 - 请考虑增加缓存的最大空间。
+
 dirResourceSet.writeExists=写入的目标已经存在
 
 extractingRoot.targetFailed=无法为提取的 JAR 文件创建目录 [{0}]
 
+jarResource.getUrlFail=无法确定JAR[{1}]中的资源[{0}]的URL
+
 standardRoot.checkStateNotStarted=如果当前未启动资源，则可能无法访问这些资源
+standardRoot.createUnknownType=无法为未知类型[{0}]创建WebResourceSet。
 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=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -16,9 +16,13 @@
 abstractConnectionHandler.ioexception.debug=正常的 IOException，忽略
 
 abstractProcessor.hostInvalid=[{0}] 是无效主机
+abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
 
 abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时
 abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
+abstractProtocolHandler.init=初始化协议处理器 [{0}]
+
+asyncStateMachine.invalidAsyncState=调用[{0}]对于具有异步状态[{1}]的请求无效
 
 response.notNonBlocking=当响应尚未进入非阻塞模式时，调用 isReady() 无效
 response.writeListenerSet=非阻塞的写监听已经被设置.

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -14,5 +14,6 @@
 # limitations under the License.
 
 ajpmessage.null=不能赋空值
+ajpmessage.overflow=在缓冲区[{1}]位置添加[{0}]字节时发生溢出错误
 
 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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -17,6 +17,7 @@ http11processor.header.parse=解�
 http11processor.request.invalidUserInfo=HTTP 请求包含带有无效 userinfo 的绝对 URI
 http11processor.request.prepare=准备请求时出错
 http11processor.request.process=错误的处理请求
+http11processor.response.finish=错误完成相应
 http11processor.socket.info=获取socket信息异常
 
 iib.available.readFail=尝试确定数据是否可用时，非阻塞读取失败
@@ -24,6 +25,7 @@ iib.eof.error=套接字读å
 iib.filter.npe=你不能添加空过滤器(null)
 iib.invalidheader=HTTP header行 [{0}] 不符合RFC 7230并且已被忽略。
 iib.invalidmethod=在方法名称中发现无效的字符串, HTTP 方法名必须是有效的符号.
+iib.readtimeout=从套接字读取数据超时
 
 iob.failedwrite=写入.失败
 iob.illegalreset=response 在提交后可能被重置

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,3 +15,5 @@
 
 chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束
 chunkedInputFilter.invalidCrlfNoCR=无效的行尾结束符序列(LF前缺少CR)
+
+inputFilter.maxSwallow=最大吞咽数据大小超出异常

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -15,6 +15,8 @@
 
 upgrade.sis.isFinished.ise=当 ServletInputStream 不处于非阻塞模式时调用 isFinished() 是非法的（即必须首先调用 setReadListener()）
 upgrade.sis.read.closed=InputStream 已被关闭
+upgrade.sis.readListener.set=在同一个upgraded连接上调用多次setReadListener()函数是非法的
 upgrade.sos.write.closed=输出流已被关闭
+upgrade.sos.writeListener.null=对setWriteListener()传递null是非法的
 
 upgradeProcessor.unexpectedState=因传入套接字状态为[{0}]而意外关闭升级连接

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -13,15 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+connectionPrefaceParser.mismatch=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符。
+
+connectionSettings.debug=连接[{0}]，参数类型[{1}]设置为[{2}]
 connectionSettings.headerTableSizeLimit=连接 [{0}]，尝试将 header 表大小设置为 [{1}]，但限制为 16k
 
 hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因为它超出了允许的0到255范围。
 
+http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
+\n
+
 stream.inputBuffer.reset=流.重置
 
 streamProcessor.service.error=请求处理期间出错
 
 upgradeHandler.pingFailed=对客户端发送ping 链接失败.
 upgradeHandler.socketCloseFailed=关闭 socket 错误
+upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
+\n
+upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}]
+upgradeHandler.writeHeaders=连接 [{0}]，流 [{1}]
 
 writeStateMachine.ise=处于 [{1}] 状态时调用 [{0}()] 方法是非法的

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -17,18 +17,34 @@ jasper.error.emptybodycontent.nonempty=�
 
 jsp.error.attempt_to_clear_flushed_buffer=错误：尝试清空已刷新的缓冲区
 jsp.error.attribute.deferredmix=不能在同一属性值中同时使用 ${} 和 #{} EL 表达式
-jsp.error.attribute.noequal=:)是期望的符号
+jsp.error.attribute.noequal=期望的符号是等号
 jsp.error.attribute.nowhitespace=JSP 规范要求一个属性名字前有空格
 jsp.error.bad.scratch.dir=你指定的 scratchDir：[{0}] 不可用。
+jsp.error.compiler=没有可用的Java编译器
+jsp.error.corresponding.servlet=生成的servlet错误:\n\
+\n
+jsp.error.could.not.add.taglibraries=不能增加一个或者多个tag 库.
 jsp.error.data.file.processing=处理文件 [{0}] 错误
 jsp.error.el.template.deferred=#{...} 不允许出现在模板文本中
 jsp.error.fallback.invalidUse=jsp:fallback必须是jsp:plugin的直接子代
 jsp.error.file.cannot.read=无法读取文件 [{0}]
 jsp.error.file.not.found=文.件[{0}] 未找到
+jsp.error.file.not.registered=文件[{0}] 不存在
+jsp.error.include.tag=无效的jsp:include标签
+jsp.error.internal.filenotfound=内部错误：找不到文件 [{0}]
+jsp.error.internal.tldinit=无法初始化 TldLocationsCache: [{0}]
+jsp.error.invalid.tagdir=标签文件目录 [{0}] 不以"/WEB-INF/tags"开头
+jsp.error.invalid.version=为标签 [{0}] 定义了无效的 JSP 版本号
+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.jsproot.version.invalid=版本号 [{0}] 无效，版本号必须是"1.2"、"2.0"、"2.1"、"2.2"、"2.3"中的一个
 jsp.error.lastModified=无法确定文件 [{0}] 的最后修改日期
 jsp.error.location=行.: [{0}], 列: [{1}]
+jsp.error.mandatory.attribute=[{0}]: 强制性属性 [{1}] 缺失。
+jsp.error.multiple.jsp=不能有.多个规格
+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 )不允许出现在这里
 jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
@@ -36,30 +52,43 @@ jsp.error.outputfolder=无输å‡�
 jsp.error.overflow=错误：JSP缓冲区溢出
 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.quotes.unterminated=未终结的引号
 jsp.error.scripting.variable.missing_name=无法从属性[{0}]确定脚本变量名称
 jsp.error.servlet.invalid.method=JSP 只允许 GET、POST 或 HEAD。Jasper 还允许 OPTIONS
-jsp.error.single.line.number=JSP文件 [{1}] 的第 [{0}] 行发生了一个错误
+jsp.error.single.line.number=JSP文件：[{1}] 的第 [{0}] 行发生了一个错误
 jsp.error.stream.close.failed=流.关闭失败
 jsp.error.stream.closed=流.关闭
 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}]
+jsp.error.taglibDirective.missing.location='uri'和'tagdir' 属性均未指定。
 jsp.error.taglibDirective.uriInvalid=为标签库[{0}]提供的URI不是有效的URI
+jsp.error.teiclass.instantiation=无法加载或实例化TagExtraInfo类：[{0}]。
 jsp.error.tld.mandatory.element.missing=TLD [{1}] 中强制 TLD 元素 [{0}] 不存在或为空
+jsp.error.unable.load=无法加载JSP的相关类
 jsp.error.unable.to_find_method=不能为属性:[{0}]找到setter 方法.
+jsp.error.unavailable=JSP已被标记为不可用
+jsp.error.unbalanced.endtag=结束标签&lt;/{0}不对称
 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.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.tldCache.noTldSummary=至少有一个JAR被扫描用于TLD但尚未包含TLD。 为此记录器启用调试日志记录，以获取已扫描但未在其中找到TLD的完整JAR列表。 在扫描期间跳过不需要的JAR可以缩短启动时间和JSP编译时间。
 jsp.tldCache.tldInDir=在目录 [{0}]中找到了TLD文件。
 jsp.warning.compiler.classfile.delete.fail.unknown=删除生成的class文件失败
 jsp.warning.enablePooling=警告：initParam enablePooling的值无效。将使用默认值“true”
 jsp.warning.unknown.element.in.attribute=属性中的未知元素 [{0}]
+jsp.warning.unknown.element.in.tag=标签中的未知元素 [{0}]
 jsp.warning.unknown.element.in.tagfile=标签文件中的未知元素 [{0}]
 jsp.warning.unknown.element.in.taglib=标签文件中的未知元素 [{0}]
 jsp.warning.unknown.element.in.validator=验证器中的未知元素 [{0}]
@@ -117,8 +146,11 @@ jspc.webfrg.header=<?xml version="1.0" e
 由 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.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=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -14,3 +14,5 @@
 # limitations under the License.
 
 contextBindings.unknownContext=未知.上下文名:[{0}]
+
+namingContext.contextExpected=上下文Context未绑定名称name

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -16,5 +16,7 @@
 diagnostics.threadDumpTitle=打印全部线程
 diagnostics.vmInfoClassCompilation=:)class汇编
 diagnostics.vmInfoLogger=日志记录器（Logger）信息
+diagnostics.vmInfoOs=操作系统信息
 diagnostics.vmInfoRuntime=运行时信息
 diagnostics.vmInfoSystem=系统.属性
+diagnostics.vmInfoThreadCounts=线程数

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties?rev=1847047&r1=1847046&r2=1847047&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties Tue Nov 20 19:10:05 2018
@@ -14,3 +14,5 @@
 # limitations under the License.
 
 c2bConverter.recycleFailed=无法回收C2B转换器。创建新的BufferedWriter，WriteConvertor和IntermediateOutputStream。
+
+uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字

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=1847047&r1=1847046&r2=1847047&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 Tue Nov 20 19:10:05 2018
@@ -15,8 +15,11 @@
 
 filterDef.invalidFilterName=过滤器定义中的<filter-name> [{0}] 无效。
 
+webRuleSet.nameCount=<name>元素只能出现1次
 webRuleSet.postconstruct.duplicate=class [{0}] 有重复的 post 构造方法声明
 
+webXml.duplicateFilter=重复的过滤器名称 [{0}]
 webXml.duplicateServletMapping=名为 [{0}]和 [{1}] 的servlet不能映射为一个url模式(url-pattern) [{2}]
+webXml.mergeConflictSessionCookieName=会话cookie名称在多个具有不同值的片段中定义不一致，包括位于 [{1}] 的片段 [{0}]
 webXml.mergeConflictSessionTrackingMode=会话跟踪模式在多个片段中定义不一致，包括位于[{1}]的名称为[{0}]的片段
 webXml.version.unknown=未知版本字符串 [{0}]。将使用默认版本。



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