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
The following commit(s) were added to refs/heads/master by this push: new eedaeab Import updated Chinese translations from poeditor.com eedaeab is described below commit eedaeab1b2870dd24c2b40a0d0ad686408c9a05b Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Dec 6 10:00:58 2019 +0000 Import updated Chinese translations from poeditor.com Contributions provided by lins and 磊 --- java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/realm/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 | 1 + java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++ java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 + java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 + java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 5 +++++ java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 + .../org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 + webapps/docs/changelog.xml | 4 ++++ 13 files changed, 22 insertions(+) diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties index f65f96a..c3e7dd8 100644 --- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +farmWarDeployer.deleteFail=无法删除 [{0}] farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效 farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名 farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}] diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties index 1065222..eb9540c 100644 --- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties @@ -24,6 +24,7 @@ jaasCallback.username=返回用户名 [{0}] jaasMemoryLoginModule.invalidCredentials=用户名或密码不正确 jaasMemoryLoginModule.noConfig=无法加载配置文件 [{0}] +jaasRealm.authenticateFailure=用户 [{0}] 认证失败 jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建 jaasRealm.classNotFound=找不到类 [{0}] jaasRealm.failedLogin=由于登录失败,用户名 [{0}] 无法授权 diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties index df24712..2249786 100644 --- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties @@ -44,6 +44,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常 standardManager.unloading.nosessions=没有要卸载的持久会话 standardSession.attributeEvent=会话属性事件侦听器引发异常 +standardSession.getAttribute.ise=getAttribute: 会话已失效 standardSession.getAttributeNames.ise=getAttributeNames:会话已失效 standardSession.getCreationTime.ise=getCreataionTime:会话已经无效 standardSession.getIdleTime.ise=getIdleTime: 已失效的会话 diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties index df5c273..cc3c57d 100644 --- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties @@ -88,6 +88,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错 hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成 hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase [{0}],将被忽略 hostConfig.deployDir=把web 应用程序部署到目录 [{0}] +hostConfig.deployDir.error=无法部署应用目录 [{0}] hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错 hostConfig.deployWar.hiddenDir=将忽略目录[{0}],因为WAR [{1}]优先,unpackWAR为false hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错 diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties index ce79add..613cceb 100644 --- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties @@ -85,6 +85,7 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。 remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。 +remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}] remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效 requestFilterValve.configInvalid=为Remote [Addr | Host]阀门提供了一个或多个无效配置设置,阻止Valve及其父容器启动 diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties b/java/org/apache/coyote/LocalStrings_zh_CN.properties index 2f4826b..a3331ad 100644 --- a/java/org/apache/coyote/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties @@ -23,6 +23,9 @@ abstractProcessor.hostInvalid=[{0}] 是无效主机 abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级(upgrade)。 abstractProcessor.socket.ssl=获取SSL属性异常 +abstractProtocol.processorRegisterError=注册请求处理器错误 +abstractProtocol.processorUnregisterError=注销请求处理器错误 + abstractProtocolHandler.asyncTimeoutError=错误的处理异步超时 abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}] abstractProtocolHandler.init=初始化协议处理器 [{0}] diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties index b15b9fb..534b430 100644 --- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties @@ -18,5 +18,6 @@ ajpmessage.overflow=在缓冲区[{1}]位置添加[{0}]字节时发生溢出错 ajpprocessor.certs.fail=):证书转换失败 ajpprocessor.header.error=头部信息解析失败 +ajpprocessor.readtimeout=从Socket读取数据超时 ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。 diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties index 53cc01f..ef42f82 100644 --- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties @@ -19,6 +19,7 @@ http11processor.header.parse=解析 HTTP 请求 header 错误 http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。 http11processor.request.invalidScheme=HTTP请求包含具有无效方案的绝对URL http11processor.request.invalidUserInfo=HTTP 请求包含带有无效 userinfo 的绝对 URI +http11processor.request.multipleContentLength=请求包含了多个content-length请求头参数 http11processor.request.noHostHeader=http/1.1请求没有提供主机头 http11processor.request.prepare=准备请求时出错 http11processor.request.process=错误的处理请求 diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties index e6f9ae0..b22fa97 100644 --- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties @@ -52,6 +52,7 @@ http2Parser.swallow.debug=连接:[{0}],流:[{1}],吞下[{2}]字节 stream.closed=连接[{0}],流[{1}],一旦关闭就无法写入流 stream.header.debug=连接[{0}],流[{1}],HTTP标头[{2}],值[{3}] stream.header.noPath=连接[{0}],流[{1}],[:path]伪标头为空 +stream.header.required=连接 [{0}], 流 [{1}], 缺少一个或多个必要的头文件 stream.header.unknownPseudoHeader=收到连接[{0}],流[{1}],未知伪标头[{2}] stream.inputBuffer.readTimeout=等待从客户端读取数据超时 stream.inputBuffer.reset=流.重置 @@ -78,6 +79,7 @@ upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未 upgradeHandler.rst.debug=连接[{0}],流[{1}],错误[{2}],消息[{3}],RST(关闭流) upgradeHandler.sendPrefaceFail=连接[{0}],给客户端发送前言失败 upgradeHandler.socketCloseFailed=关闭 socket 错误 +upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间 upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}],但所有远程流都必须使用奇数标识符\n\ \n upgradeHandler.tooMuchOverhead=连接[{0}],开销过大,连接将关闭 @@ -89,4 +91,7 @@ upgradeHandler.windowSizeTooBig=连接[{0}],流[{1}],窗口太大 upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}] upgradeHandler.writeHeaders=连接 [{0}],流 [{1}] +windowAllocationManager.notify=连接[{0}], 流[{1}], 等待类型[{2}], 通知类型[{3}] +windowAllocationManager.waitFor.ise=连接[{0}], 流[{1}], 已经准备好 + writeStateMachine.ise=处于 [{1}] 状态时调用 [{0}()] 方法是非法的 diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties index d58131b..2b6c38e 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -157,6 +157,7 @@ jsp.warning.dumpSmap=警告:初始化堆内存的值无效。将使用“false jsp.warning.enablePooling=警告:initParam enablePooling的值无效。将使用默认值“true” jsp.warning.fork=警告:initParam的值无效。将使用“true”的默认值 jsp.warning.noJarScanner=警告:ServletContext中没有设置org.apache.tomcat.JarScaner。回到默认的JarScaner实现。 +jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false” jspc.delete.fail=无法删除文件 [{0}] jspc.error.fileDoesNotExist=文件参数 [{0}] 不存在 diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties index 6e36465..770e003 100644 --- a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties @@ -31,6 +31,7 @@ http.invalidLeadingZero=非零的IPv4字符可能不包含前导零。 http.invalidOctet=无效字符[{0}].IPv4字符的有效范围为0~255。 http.invalidSegmentEndState=状态[{0}]对于段的结尾无效。 http.noClosingBracket=ipv6 地址缺失一个闭合的圆括号 +http.noOpeningBracket=IPv6地址缺少开括号( http.singleColonEnd=IPv6地址不能以单个“.”结尾。 http.singleColonStart=一个IPv6地址也许不是以单个冒号":"开头的。 http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。 diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties index b36519e..4b74f50 100644 --- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties @@ -14,6 +14,7 @@ # limitations under the License. pojoEndpointBase.onCloseFail=):无法为类型为[{0}]的POJO调用POJO端点的onClose方法 +pojoEndpointBase.onError=在错误发生后,没有为[{0}]配置错误处理 pojoEndpointBase.onOpenFail=无法为类型为[{0}]的POJO调用POJO端点的onOpen方法 pojoEndpointServer.getPojoInstanceFail=创建类型为 [{0}] 的 POJO 实例失败 diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0cb6a85..d221bc5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -193,6 +193,10 @@ Expand the coverage of the French translations provided with Apache Tomcat. (remm) </add> + <add> + Expand the coverage of the Chinese translations provided with Apache + Tomcat. Contributions provided by lins and 磊. (markt) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org