This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 446d4b48a635495f0432ebf2823ee4ba596122bb Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Oct 5 19:28:24 2020 +0100 Improve Chinese translations. Provided by leeyazhou --- java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/manager/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/coyote/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 4 ++++ java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 4 ++++ webapps/docs/changelog.xml | 3 +++ 13 files changed, 26 insertions(+) diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties index 405d80f..0dc26ad 100644 --- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties @@ -83,6 +83,7 @@ request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作 request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除 request.illegalWrap=请求包装器必须包装从getRequest()获得的请求 request.notAsync=如果当前请求不在异步模式下,则调用此方法是非法的(即isAsyncStarted()返回false) +request.session.failed=由于[{1}],加载会话[{0}]失败 requestFacade.nullRequest=请求对象已被回收,不再与此facade关联 diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties index a4084f3..3058278 100644 --- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties @@ -162,6 +162,7 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单 managerServlet.saveFail=失败 - 配置保存失败:[{0}] managerServlet.saved=OK - 服务器配置已保存 managerServlet.savedContext=OK - 上下文[{0}]配置已保存 +managerServlet.savedContextFail=失败 - 上下文[{0}]配置保存失败 managerServlet.serverInfo=OK - 服务器信息\n\ Tomcat版本: [{0}]\n\ 操作系统名称: [{1}]\n\ diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties index 2354b3f..7a1cc2c 100644 --- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties @@ -29,6 +29,7 @@ JDBCStore.wrongDataSource=无法打开 JNDI 数据源 [{0}] fileStore.createFailed=无法创建用于存储会话数据的目录[{0}]。 fileStore.deleteFailed=无法删除阻止创建会话存储位置的文件 [{0}] fileStore.deleteSessionFailed=无法删除不再需要的文件[{0}] +fileStore.invalid=无效的持久化文件[{0}],会话ID为[{1}] fileStore.loading=正在从文件[{1}]加载会话[{0}] fileStore.removing=正在删除文件{1}处的会话{0}] fileStore.saving=保存会话[{0}]到文件[{1}] diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties index 8155d5d..c7e6a59 100644 --- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties @@ -65,6 +65,7 @@ contextConfig.jarFile=无法处理Jar[{0}]的注解 contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。 contextConfig.jspFile.warning=警告:在Servlet 2.4 中,JSP文件[{0}]必须以‘/’开头 contextConfig.missingRealm=对应的认证领域未配置 +contextConfig.noAntiLocking=配置 java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略 contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件 contextConfig.processAnnotationsJar.debug=扫描jar文件中注解[{0}]的类文件 contextConfig.processAnnotationsWebDir.debug=扫描 web 应用程序目录下含有 [{0}] 注解的 class 文件 diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties index b5093ec..7a47a98 100644 --- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties @@ -127,6 +127,8 @@ http.511.reason=需要网络身份验证 jdbcAccessLogValve.close=无法关闭数据库。 jdbcAccessLogValve.exception=执行插入访问项时发生异常 +persistentValve.filter.failure=无法编译filter=[{0}] + remoteCidrValve.invalid=为{0}提供的配置无效。有关详细信息,请参阅以前的消息 remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。 diff --git a/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties index 1053848..9061943 100644 --- a/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/valves/rewrite/LocalStrings_zh_CN.properties @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +rewriteMap.tooManyParameters=对当前map来说参数太多 + rewriteValve.closeError=关闭配置时出错 rewriteValve.invalidFlags=[{0}]标志[{1}]中的标志无效 rewriteValve.invalidLine=无效行[{0}] diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties b/java/org/apache/coyote/LocalStrings_zh_CN.properties index 7c5dc18..6291918 100644 --- a/java/org/apache/coyote/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties @@ -52,6 +52,8 @@ asyncStateMachine.invalidAsyncState=调用[{0}]对于具有异步状态[{1}]的 compressionConfig.ContentEncodingParseFail=检查压缩是否已经在使用时,解析Content-Encoding头失败 +continueResponseTiming.invalid=对于continueResponseTiming,值[{0}]不是有效的配置项 + request.notAsync=只有在异步处理或HTTP升级处理中切换到非阻塞IO才有效 request.nullReadListener=传递给setReadListener()的侦听器不能为空 request.readListenerSet=已设置非阻塞读取侦听器 diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties index 8c6f104..491a9f3 100644 --- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties @@ -75,6 +75,7 @@ http2Parser.swallow.debug=连接:[{0}],流:[{1}],吞下[{2}]字节 pingManager.roundTripTime=连接[{0}]往返时间测量为[{1}]ns +stream.clientCancel=客户端在响应完成前重置了数据流 stream.closed=连接[{0}],流[{1}],一旦关闭就无法写入流 stream.header.case=连接[{0}],流[{1}],HTTP标头名称[{2}]必须小写 stream.header.connection=HTTP/2请求中不允许连接{0}、流{1}、HTTP头[连接] @@ -96,6 +97,7 @@ stream.inputBuffer.reset=流.重置 stream.inputBuffer.signal=读线程在等待时,数据被添加到inBuffer中。 发信号通知该线程继续 stream.notWritable=连接{0},流{1},此流不可写 stream.outputBuffer.flush.debug=连接{0},流{1},用缓冲区在位置{2}刷新输出,writeInProgress[{3}]并关闭了[{4}] +stream.recycle=连接[{0}],流[{1}]已回收 stream.reprioritisation.debug=连接[{0}],流[{1}],独占[{2}],父[{3}],权重[{4}] stream.reset.fail=连接[{0}],流[{1}],重置流失败 stream.reset.receive=连接{0},流{1},由于{2}而收到重置 diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties index 807940d..d8b88ad 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -291,9 +291,12 @@ jsp.warning.mappedFile=警告:initParam mappedFile的值无效。将使用默 jsp.warning.maxLoadedJsps=警告:initParam maxLoadedJsps的值无效。将使用默认值“-1”。 jsp.warning.modificationTestInterval=警告:initParam modificationTestInterval的值无效。将使用默认值“4”秒 jsp.warning.noJarScanner=警告:ServletContext中没有设置org.apache.tomcat.JarScaner。回到默认的JarScaner实现。 +jsp.warning.poolTagsWithExtends=警告:poolTagsWithExtends initParam值无效,将会使用默认值“false” jsp.warning.quoteAttributeEL=警告:initParam quoteattribeel的值无效。将使用默认值“false” jsp.warning.recompileOnFail=警告:initParam recompileOnFail的值无效。将使用默认值“false” +jsp.warning.strictGetProperty=警告:无效的初始参数strictGetProperty值,将会使用默认值“true” jsp.warning.strictQuoteEscaping=警告:对initParam strictQuoteEscaping来说无效的值,将会使用默认值“true” +jsp.warning.strictWhitespace=警告:无效的初始参数strictWhitespace值,将使用默认值“true” jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false” jsp.warning.tagPreDestroy=处理标记实例的preDestroy时出错[{0}] jsp.warning.tagRelease=处理[{0}]的标记实例上的释放时出错 @@ -301,6 +304,7 @@ jsp.warning.unknown.sourceVM=忽略未知源VM[{0}] jsp.warning.unknown.targetVM=忽略未知目标VM[{0}] jsp.warning.unsupported.sourceVM=不支持的源VM[{0}]请求,使用[{1}] jsp.warning.unsupported.targetVM=不支持请求的目标VM[{0}],使用[{1}] +jsp.warning.useInstanceManagerForTags=警告:无效的初始化参数useInstanceManagerForTags值,将会使用默认值“false” jsp.warning.xpoweredBy=警告:initParam xpoweredBy的值无效。将使用默认值“false” jspc.delete.fail=无法删除文件 [{0}] diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties index 1a61c77..7434a08 100644 --- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties @@ -22,6 +22,8 @@ byteBufferUtils.cleaner=无法使用直接ByteBuffer清洁剂,可能会发生 chunk.overflow=缓冲区溢出且未设置接收器,请限制[{0}]和缓冲区长度[{1}] +encodedSolidusHandling.invalid=值[{0}]未识别 + hexUtils.fromHex.nonHex=输入只能由十六进制数字组成 hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成 diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties index 847194a..870af79 100644 --- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties @@ -163,6 +163,7 @@ sslHostConfigCertificate.mismatch=属性[{0}]是在名为[{1}]的SSLHostConfigCe sslImplementation.cnfe=无法为类 [{0}] 创建SSLImplementation sslUtilBase.active=活跃的[{0}]是:[{1}] +sslUtilBase.aliasIgnored=FIPS已启用所以别名[{0}]将被忽略。如果key存储中的key大于一个,使用的key将取决于key存储的实现 sslUtilBase.alias_no_key_entry=别名[{0}]不标识密钥项 sslUtilBase.invalidTrustManagerClassName=提供的trustManagerClassName[{0}]未实现javax.net.ssl.TrustManager sslUtilBase.keystore_load_failed=由于{2},无法加载路径为{1}]的密钥库类型{0}] diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties index cb77244..06aa5f6 100644 --- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties @@ -67,6 +67,7 @@ wsFrame.noContinuation=当需要延续帧时启动了新消息。 wsFrame.notMasked=客户端帧未被屏蔽,但必须屏蔽所有客户端帧 wsFrame.oneByteCloseCode=客户端发送了一个包含无效单字节有效负载的关闭帧。 wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode [{2}], payload 长度 [{3}] +wsFrame.readFailed=异步客户端读取失败 wsFrame.sessionClosed=无法处理客户端数据,因为会话已被关闭 wsFrame.suspendRequested=已请求暂停接收邮件。 wsFrame.textMessageTooBig=解码的文本消息对于输出缓冲区太大,终结点不支持部分消息 @@ -106,6 +107,8 @@ wsSession.messageFailed=无法写入完整消息,因为WebSocket连接已关 wsSession.removeHandlerFailed=无法删除处理程序[{0}],因为它未在此会话中注册 wsSession.sendCloseFail=给远程端点发送关闭消息失败,session:[{0}] wsSession.timeout=WebSocket会话[{0}]超时已过期 +wsSession.timeoutRead=WebSocket会话[{0}]读取空闲超时过期 +wsSession.timeoutWrite=WebSocket会话[{0}]写入空闲超时过期 wsSession.unknownHandler=无法添加消息处理程序[{0}],因为它是针对无法识别的类型[{1}] wsSession.unknownHandlerType=无法添加消息处理程序[{0}],因为它被包装为无法识别的类型[{1}]。 @@ -126,6 +129,7 @@ wsWebSocketContainer.pathNoHost=URI中未指定主机 wsWebSocketContainer.pathWrongScheme=不支持方案[{0}]。支持的方案是ws和wss wsWebSocketContainer.proxyConnectFail=失败连接到已配置的代理 [{0}]。HTTP 响应码是 [{1}] wsWebSocketContainer.redirectThreshold=循环位置头[{0}]检测到/达到最大重定向数[{1}]的最大值[{2}] +wsWebSocketContainer.responseFail=HTTP升级WebSocket失败,但是部分数据已被接收:状态码:[{0}],HTTP请求头[{1}] wsWebSocketContainer.sessionCloseFail=ID 为 [{0}] 的session 没有彻底关闭 wsWebSocketContainer.shutdown=web应用程序正在停止 wsWebSocketContainer.sslEngineFail=无法创建SSLEngine以支持SSL/TLS连接 diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 57077e9..87bfda1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -224,6 +224,9 @@ href="https://bugs.openjdk.java.net/browse/JDK-8234808">JDK-8234808</a>. (markt) </fix> + <add> + Improvements to Chinese translations. Provided by leeyazhou. (markt) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org