This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a97d332a6fb440123540a2035d400fff10290b97
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 5 20:46:30 2020 +0100

    Improvements to Chinese translations. Provided by leeyazhou.
---
 java/org/apache/catalina/connector/LocalStrings_zh_CN.properties | 1 +
 java/org/apache/catalina/session/LocalStrings_zh_CN.properties   | 1 +
 java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties    | 2 ++
 java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties   | 4 ++++
 webapps/docs/changelog.xml                                       | 3 +++
 5 files changed, 11 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index b2830bf..b926e7b 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -68,6 +68,7 @@ inputBuffer.streamClosed=关闭的流。
 request.asyncNotSupported=当前链的筛选器或servlet不支持异步操作。
 request.fragmentInDispatchPath=调度路径[{0}]中的片段已被删除
 request.notAsync=如果当前请求不在异步模式下,则调用此方法是非法的(即isAsyncStarted()返回false)
+request.session.failed=由于[{1}],加载会话[{0}]失败
 
 requestFacade.nullRequest=请求对象已被回收,不再与此facade关联
 
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index b082234..7e98915 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/tomcat/util/buf/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index 6863c23..fb5619f 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@
 
 b2cConverter.unknownEncoding=不支持字符编码[{0}]
 
+encodedSolidusHandling.invalid=值[{0}]未识别
+
 uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字
 uDecoder.eof=文件结尾(EOF)
 uDecoder.noSlash=不允许使用编码的斜杠字符
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index a829fb0..91a4408 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -59,6 +59,7 @@ wsFrame.noContinuation=当需要延续帧时启动了新消息。
 wsFrame.notMasked=客户端帧未被屏蔽,但必须屏蔽所有客户端帧
 wsFrame.oneByteCloseCode=客户端发送了一个包含无效单字节有效负载的关闭帧。
 wsFrame.partialHeaderComplete=接收到WebSocket帧. fin [{0}], rsv [{1}], OpCode 
[{2}], payload 长度 [{3}]
+wsFrame.readFailed=异步客户端读取失败
 wsFrame.sessionClosed=无法处理客户端数据,因为会话已被关闭
 wsFrame.textMessageTooBig=解码的文本消息对于输出缓冲区太大,终结点不支持部分消息
 wsFrame.wrongRsv=对于具有opCode [{1}]的消息,客户端帧将保留位设置为[{0}],此端点不支持
@@ -94,6 +95,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}]。
 
@@ -114,6 +117,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 5345516..7061651 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,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

Reply via email to