svn commit: r1850334 - in /tomcat/trunk/java/org/apache: catalina/authenticator/ catalina/core/ catalina/filters/ catalina/ha/session/ catalina/mapper/ catalina/startup/ catalina/tribes/group/interceptors/ catalina/tribes/membership/cloud/ catalina/val...

[markt]

Author: markt
Date: Fri Jan  4 08:59:54 2019
New Revision: 1850334

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

Modified:
    
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/catalina/valves/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

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=1850334&r1=1850333&r2=1850334&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
 Fri Jan  4 08:59:54 2019
@@ -32,7 +32,7 @@ authenticator.unauthorized=无法�
 
 basicAuthenticator.invalidCharset=只允许值为null、空字符串或UTF-8
 
-digestAuthenticator.cacheRemove=已从客户端 nonce 缓存中删
除有效条目，以便为新条目è…
¾å‡ºç©ºé—´ã€‚重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增åŠ
 cnonceCacheSize。此类型的进一步警告将被抑制5分钟。
+digestAuthenticator.cacheRemove=已从客户端 nonce 缓存中删
除有效条目，以便为新条目è…
¾å‡ºç©ºé—´ã€‚重播攻击现在是可能的。为防止重播攻击的可能性，请降低nonceValidity或增åŠ
 nonceCacheSize。此类型的进一步警告将被抑制5分钟。
 
 singleSignOn.debug.cookieCheck=SSO检查SSO cookie
 singleSignOn.debug.cookieNotFound=SSO没有找到SSO cookie

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -51,6 +51,7 @@ filterChain.filter=Filter 执行æ
 naming.addEnvEntry=添加环境条目 [{0}]
 naming.addResourceEnvRef=添加资源环境引用 [{0}]
 naming.invalidEnvEntryType=环境条目[{0}]没有一个有效哦的类型
+naming.namingContextCreationFailed=创建上下文名称失败
 naming.wsdlFailed=未找到 wsdl 文件：[{0}]
 
 standardContext.backgroundProcess.resources=异常处理资源[{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=1850334&r1=1850333&r2=1850334&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties 
Fri Jan  4 08:59:54 2019
@@ -32,4 +32,4 @@ httpHeaderSecurityFilter.clickjack.inval
 
 remoteCidrFilter.noRemoteIp=客户端没有 IP 地址。请求被拒绝。
 
-requestFilter.deny=拒绝的请求由于属性:[{1}]
+requestFilter.deny=基于属性:[{1}]，[{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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -22,6 +22,7 @@ deltaManager.loading.cnfe=加载æ
 deltaManager.loading.ioe=加载持久 session 时出现 IOException：[{0}]
 deltaManager.noSessionState=管理者
[{0}]：没有收到[{1}]发送的会话状态，在[{2}]毫秒之后超时。
 deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session 
状态反序列化
+deltaManager.receiveMessage.allSessionDataBegin=管理者
[{0}]：接收到所有会话数据状态
 
deltaManager.receiveMessage.delta.unknown=管理器[{0}]：未知会话的接收会话增量[{1}]
 deltaManager.receiveMessage.expired=管理器[{0}]: 接收到的会话 [{1}] 
已过期。
 deltaManager.receiveMessage.unloadingBegin=管理器[{0}]: 开始卸载会话

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=1850334&r1=1850333&r2=1850334&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 
Fri Jan  4 08:59:54 2019
@@ -15,5 +15,6 @@
 
 mapper.addHostAlias.success=为虚拟主机 [{1}] 注册了别名 [{0}]
 
+mapperListener.pauseContext=根据服务需要，注册内
容[{0}]已经重新加载
 
mapperListener.registerWrapper=为服务Service[{2}]在上下文Context[{1}]注册Wrapper[{0}]
 
mapperListener.unregisterHost=在域[{1}]中.,不能注册主机[{0}]为服务[{2}]

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -48,7 +48,7 @@ expandWar.deleteOld=发现一ä
 expandWar.missingJarEntry=无法获得 JarEntry [{0}] 的输入流 - WAR 
文件是否已损坏?
 
 
hostConfig.appBase=主机[{0}]的应用程序基础[{1}]不存在或不是目录。deployOnStartUp和autoDebug已设置为false，以防止部署错误。å
…¶ä»–错误仍然可能发生。
-hostConfig.deployDir=部署 web 应用程序目录 [{0}]
+hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
 hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
 hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
 hostConfig.expanding=扩展已发现的 web 应用程序 archive
@@ -57,7 +57,7 @@ hostConfig.stop=:)Host配置:å�
 tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
 tomcat.homeDirMakeFail=无法创建用作主目录的目录 [{0}]
 tomcat.invalidCommandLine=无效的命令行参数 [{0}]
-tomcat.noContextXml=不能找到web 应用的context.xml [{0]}
+tomcat.noContextXml=不能找到web 应用的context.xml [{0}]
 
 userConfig.database=加载用户数据库异常
 userConfig.deploying=正在部署用户 web 应用程序

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -16,7 +16,7 @@
 domainFilterInterceptor.member.refused=成员被拒绝加入集群 cluster[{0}]
 
domainFilterInterceptor.message.refused=从集群[{0}]中接收的消息被拒绝
 
-encryptInterceptor.decrypt.error.short-message=失败的解密消息: 
提前结束的结尾消息
+encryptInterceptor.decrypt.error.short-message=解密消息失败: 
结尾消息提前结束
 encryptInterceptor.encrypt.failed=无法加密信息
 
 gzipInterceptor.report=:)GZip 拦截器报告[\n\

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -19,5 +19,7 @@ abstractStream.trustManagerError=无�
 
 cloudMembershipService.stopFail=无法停止静态成员资æ 
¼æœåŠ¡ï¼Œçº§åˆ«ä¸ºï¼š[{0}]
 
+dnsMembershipProvider.dnsError=由于命名空间[{0}]导致的多个错误主机地址
+
 kubernetesMembershipProvider.memberError=创建成员错误
 kubernetesMembershipProvider.noNamespace=命名空间未设置

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -40,6 +40,7 @@ http.415.desc=源服务器æ
 http.415.reason=不支持的媒体类型
 http.416.reason=范围不满足
 http.417.reason=期望的失败
+http.423.desc=源或目标资源的方法被锁
 http.423.reason=已锁定
 http.426.reason=需要升级
 http.428.desc=原始服务器要求请求是有条件的。

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=1850334&r1=1850333&r2=1850334&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 Jan  4 08:59:54 2019
@@ -15,6 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=根据 TLD，[{0}] 标签必
须为空，但不是
 
+jsp.error.action.isnottagfile=[{0}]行为只能用于标签文件
 jsp.error.attempt_to_clear_flushed_buffer=错误：尝试清
空已刷新的缓冲区
 jsp.error.attribute.deferredmix=不能在同一属性值中同时使用 ${} 
和 #{} EL 表达式
 jsp.error.attribute.noequal=期望的符号是等号
@@ -24,6 +25,7 @@ jsp.error.bad.scratch.dir=你指å
 jsp.error.bad_attribute=属性[{0}]无效为tag[{1}] 通过TLD
 jsp.error.beans.noproperty=在[{1}]类型bean中找不到任何有å…
³å±žæ€§[{0}]的信息
 jsp.error.beans.nullbean=尝试获取一个bean 操作在一个空对象上.
+jsp.error.cannotAddResolver=在第一次请求发生之后不能调用addELResolver
 jsp.error.compiler=没有可用的Java编译器
 jsp.error.corresponding.servlet=生成的servlet错误:\n\
 \n
@@ -36,6 +38,7 @@ jsp.error.file.not.found=文.件[{
 jsp.error.include.exception=无法包含[{0}]
 jsp.error.include.tag=无效的jsp:include标签
 jsp.error.internal.filenotfound=内部错误：找不到文件 [{0}]
+jsp.error.internal.unexpectedNodeType=节点类型不一致
 jsp.error.invalid.tagdir=标签文件目录 [{0}] 不以"/WEB-INF/tags"开头
 jsp.error.invalid.version=为标签 [{0}] 定义了无效的 JSP 版本号
 jsp.error.ise_on_clear=当缓存大小等于0时调用clear()函数是非法的
@@ -47,11 +50,12 @@ jsp.error.lastModified=无法ç¡�
 jsp.error.loadclass.taghandler=无法为TAG [{1}]加载æ 
‡è®°å¤„理程序类[{0}]
 jsp.error.location=行.: [{0}], 列: [{1}]
 jsp.error.mandatory.attribute=[{0}]: 强制性属性 [{1}] 缺失。
+jsp.error.negativeBufferSize=缓存大小是负数
 jsp.error.nested.jspbody=JSP：体标准动作不能嵌套在另一个jsp:body 
或者 jsp:属性标准动作中
 jsp.error.nested_jsproot=嵌套的<jsp:root>
 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.no.scriptlets=脚本( &lt;%!, &lt;jsp声明, &lt;%=, 
&lt;jsp表达式, &lt;%, &lt;jsp脚本变量 )不允许出现在这里
 jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
 jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
 jsp.error.outputfolder=无输出目录
@@ -61,6 +65,7 @@ jsp.error.page.invalid.deferredsyntaxall
 jsp.error.page.invalid.iselignored=页面指令：忽略的无效值
 jsp.error.page.invalid.session=页面提示：session值无效
 jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
+jsp.error.page.nullThrowable=空异常
 jsp.error.param.invalidUse=jsp:param 
不能在jsp:include、jsp:forward或jsp:params等元素外使用
 
jsp.error.paramexpected=使用“name”和“value”属性期望“jsp:param”æ
 ‡å‡†æ“ä½œ
 jsp.error.parse.xml=无法解析 XML 文件 [{0}]
@@ -90,6 +95,7 @@ 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.badStandardAction=无效、标准的action: [{0}]
 jsp.exception=在 [{1}] 行处理 [{0}] 时发生异常
 jsp.info.ignoreSetting=因为 SecurityManager 被启用，忽略 [{1}] 的 
[{0}] 的设置
 jsp.message.jsp_added=增加JSP 为路径[{0}]为上下文[{1}]的队列
@@ -98,12 +104,14 @@ jsp.message.jsp_removed_excess=从ä�
 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.displaySourceFragment=警告：displaySourceFragment初始化参数时参数值æ—
 æ•ˆï¼Œå°†ä½¿ç”¨é»˜è®¤çš„值“true”
 jsp.warning.dumpSmap=警告：初始化堆内存的值无
效。将使用“false”的默认值
 jsp.warning.enablePooling=警告：initParam enablePooling的值无
效。将使用默认值“true”
 jsp.warning.fork=警告：initParam的值无
效。将使用“true”的默认值
 
 jspc.delete.fail=无法删除文件 [{0}]
 jspc.error.fileDoesNotExist=文件参数 [{0}] 不存在
+jspc.error.parseThreadCount=不能够转换的线程数[{0}]
 jspc.usage=用法: jspc <选项> [--] <jsp 目录>\n\
 jsp.文件在哪\n\
 \    -webapp <dir>         包含Web.应用程序的目录, 哪个jsp页面\n\

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=1850334&r1=1850333&r2=1850334&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties (original)
+++ tomcat/trunk/java/org/apache/naming/LocalStrings_zh_CN.properties Fri Jan  
4 08:59:54 2019
@@ -17,3 +17,5 @@ contextBindings.unknownContext=未ç�
 
 namingContext.contextExpected=上下文Context未绑定名称name
 namingContext.failResolvingReference=解析引用时意外异常
+
+selectorContext.methodUsingName=用[{1}]的name属性调用方法[{0}]



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