This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a001d52752134df5345330f106fc31cfd6a75189 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Feb 3 17:00:19 2025 +0000 Improvements to Chinese translations by leeyazhou. --- java/javax/el/LocalStrings_zh_CN.properties | 1 + .../authenticator/LocalStrings_zh_CN.properties | 3 + .../connector/LocalStrings_zh_CN.properties | 1 + .../catalina/core/LocalStrings_zh_CN.properties | 4 ++ .../catalina/filters/LocalStrings_zh_CN.properties | 1 + .../manager/host/LocalStrings_zh_CN.properties | 1 + .../catalina/startup/LocalStrings_zh_CN.properties | 1 + .../coyote/http11/LocalStrings_zh_CN.properties | 1 + .../http11/filters/LocalStrings_zh_CN.properties | 2 + .../coyote/http2/LocalStrings_zh_CN.properties | 1 + .../jasper/resources/LocalStrings_zh_CN.properties | 2 + .../tomcat/util/buf/LocalStrings_zh_CN.properties | 3 + .../tomcat/util/http/LocalStrings_zh_CN.properties | 1 + .../util/http/parser/LocalStrings_zh_CN.properties | 1 + .../openssl/ciphers/LocalStrings_zh_CN.properties | 1 + .../openssl/panama/LocalStrings_zh_CN.properties | 66 ++++++++++++++++++++++ .../util/threads/LocalStrings_zh_CN.properties | 4 ++ .../tomcat/websocket/LocalStrings_zh_CN.properties | 2 + webapps/docs/changelog.xml | 6 ++ 19 files changed, 102 insertions(+) diff --git a/java/javax/el/LocalStrings_zh_CN.properties b/java/javax/el/LocalStrings_zh_CN.properties index 72658c73b9..c663fca636 100644 --- a/java/javax/el/LocalStrings_zh_CN.properties +++ b/java/javax/el/LocalStrings_zh_CN.properties @@ -46,6 +46,7 @@ propertyNotReadable=属性 [{1}] 在类型 [{0}] 上不可读 propertyNotWritable=属性 [{1}] 在类型 [{0}] 上不可写 propertyReadError=在类型 [{0}] 上读取 [{1}] 时出错 propertyWriteError=在类型 [{0}] 上写入 [{1}] 时出错 +resolverNotWritable=类型[{0}]的ELResolver不可写入 staticFieldELResolver.methodNotFound=在类 [{1}] 上,找不到名为 [{0}] 的匹配公共静态方法 staticFieldELResolver.notFound=(Java 9+导出)类[{1}]上找不到名为[{0}]的公共静态字段 diff --git a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties index 63b4942eca..7010a2b9ee 100644 --- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties @@ -16,6 +16,8 @@ # Do not edit this file directly. # To edit translations see: https://tomcat.apache.org/getinvolved.html#Translations +authenticator.authentication=认证类型为[{1}]的认证主体[{0}] +authenticator.authenticationFail=用户认证失败 authenticator.certificates=此请求中没有客户端证书链 authenticator.changeSessionId=在身份验证时, 会话 ID 从 [{0}] 更改为 [{1}] authenticator.check.authorize=用户名[{0}]从连接器获得,并被信任为有效。从Tomcat领域获取此用户的角色。 @@ -32,6 +34,7 @@ authenticator.noAuthHeader=客户端未发送授权请求头 authenticator.notContext=配置错误:必须被附属于一个上下文 authenticator.requestBodyTooBig=请求正文太大,无法在身份验证过程中进行缓存 authenticator.sessionExpired=已超出登录过程所允许的时间。 如果您希望继续,则必须单击两次后退并重新单击您请求的链接或先关闭然后重新打开浏览器 +authenticator.sso=找到SSO [{0}] authenticator.tomcatPrincipalLogoutFail=使用TomcatPrincipal实例注销失败 authenticator.unauthorized=无法使用提供的凭据进行身份验证 diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties index b17e05b02b..94f8746a28 100644 --- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties @@ -54,6 +54,7 @@ coyoteRequest.attributeEvent=属性事件侦听器引发的异常 coyoteRequest.authenticate.ise=):提交响应后无法调用authenticate() coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。 coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大,导致参数不能解析。因为当前请求是块状请求,后续也不会处理。如果应用程序需要接收大的POST请求,可以使用连接器的maxPostSize解决它。 +coyoteRequest.deletePartFailed=删除[{0}]部分的临时文件失败 coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理 coyoteRequest.getContextPath.ise=找不到规范上下文路径[{0}]与用户代理[{1}]提供的URI之间的匹配项。 coyoteRequest.getInputStream.ise=已为此请求调用getReader() diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties index bb6ab112df..ac63ef80e9 100644 --- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties @@ -130,6 +130,8 @@ containerBase.realm.stop=停止旧域时出错 containerBase.threadedStartFailed=子容器启动失败 containerBase.threadedStopFailed=停止期间子容器失败 +contextNamingInfoListener.envEntry=添加上下文环境条目[{0}], 值是[{1}] + defaultInstanceManager.invalidAnnotation=无效注解[{0}] defaultInstanceManager.invalidInjection=方法资源注入注解无效 defaultInstanceManager.postConstructNotFound=类[{1}]的后构造方法[{0}]已在部署描述符中声明,但找不到 @@ -169,7 +171,9 @@ naming.wsdlFailed=未找到 wsdl 文件:[{0}] noPluggabilityServletContext.notAllowed=Servlet 3.0规范的第4.4节不允许从未在web.xml,web-fragment.xml文件中定义或未用@WebListener注释的ServletContextListener调用此方法。 +openssllistener.destroy=OpenSSL关闭失败 openssllistener.initializeFIPSFailed=无法进入FIPS模式 +openssllistener.java22=Java 22中的FFM API不可用,使用OpenSSL需要Apache Tomcat Native openssllistener.sslInit=OpenSSL初始化失败 propertiesRoleMappingListener.roleMappingFileEmpty=角色映射文件不能为空 diff --git a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties index 808dc23f1e..b4569f985d 100644 --- a/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/filters/LocalStrings_zh_CN.properties @@ -56,6 +56,7 @@ httpHeaderSecurityFilter.clickjack.invalid=为防点击挟持的响应消息头 httpHeaderSecurityFilter.committed=在进入HttpHeaderSecurityFilter的时候响应消息已经提交导致不能添加响应消息头 rateLimitFilter.initialized=RateLimitFilter [{0}] 初始值是每 [{2}] 秒 [{1}] 个请求。实际值是每 [{4}] 秒 [{3}]。 [{5}]。 +rateLimitFilter.maxRequestsExceeded=[{0}] [{1}] [{2}]的请求超出了[{4}]秒时间窗口的最大允许[{3}]。 remoteCidrFilter.invalid=为[{0}]提供的配置无效。有关详细信息,请参阅以前的消息。 remoteCidrFilter.noRemoteIp=客户端没有 IP 地址,请求被拒绝。 diff --git a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties index 2911100c86..40744b14b2 100644 --- a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties @@ -34,6 +34,7 @@ hostManagerServlet.listed=OK - 已列出Host hostManagerServlet.managerXml=FAIL - 无法安装manager.xml hostManagerServlet.noCommand=失败 - 未指定命令 hostManagerServlet.noHost=失败 - 主机名称[{0}]不存在 +hostManagerServlet.noStoreConfig=失败 - 请开启StoreConfig后使用这个特性 hostManagerServlet.noWrapper=容器未给当前servlet设置setWrapper() hostManagerServlet.persist=持久化: 正在持久化当前配置 hostManagerServlet.persistFailed=失败 - 无法持久化配置 diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties index cb7ea84c60..d54d9d5c5b 100644 --- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties +++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties @@ -69,6 +69,7 @@ contextConfig.invalidSciHandlesTypes=无法为核对一个或多个ServletConten contextConfig.jarFile=无法处理Jar[{0}]的注解 contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。 contextConfig.jspFile.warning=警告:在Servlet 2.4 中,JSP文件[{0}]必须以‘/’开头 +contextConfig.loadError=加载生成的代码错误 contextConfig.missingRealm=对应的认证领域未配置 contextConfig.noAntiLocking=配置 java.io.tmpdir的值[{0}]未指向有效路径。Web应用[{1}]antiResourceLocking配置将被忽略 contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件 diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties index 636890cdc2..810b520b35 100644 --- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties @@ -25,6 +25,7 @@ abstractHttp11Protocol.upgradeJmxRegistrationFail=JMX升级协议注册失败 http11processor.fallToDebug=\n\ \ 注意:HTTP请求解析错误的进一步发生将记录在DEBUG级别。 http11processor.header.parse=解析 HTTP 请求 header 错误 +http11processor.noParser=在HTTP协议处理程序上没有找到HttpParser,它应该在初始化时创建 http11processor.request.finish=完成请求时出错 http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。 http11processor.request.invalidScheme=HTTP请求包含具有无效方案的绝对URL diff --git a/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties index da72c0c236..6d623f27e6 100644 --- a/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties +++ b/java/org/apache/coyote/http11/filters/LocalStrings_zh_CN.properties @@ -16,6 +16,8 @@ # Do not edit this file directly. # To edit translations see: https://tomcat.apache.org/getinvolved.html#Translations +bufferedInputFilter.maxSwallowSize=忽略正文超过maxSwallowSize + chunkedInputFilter.eos=读取请求正文流异常 chunkedInputFilter.eosTrailer=读取 trailer 头时出现意外的流结束 chunkedInputFilter.error=由于先前的错误导致没有可用数据 diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties index 6706bcd295..9f4de72832 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.processFrameData.window=连接[{0}],客户端发送的数据比流 http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然保留 - 它本应该被消费掉 http2Parser.processFrameHeaders.decodingFailed=对HTTP头进行HPACK解码时出错 http2Parser.processFrameHeaders.payload=连接:[{0}],流:[{1}],正在处理[{1}]大小的头文件负载 +http2Parser.processFramePriorityUpdate.debug=连接 [{0}], 数据流 [{1}], 紧迫性 [{2}], 增量 [{3}] http2Parser.processFramePushPromise=连接 [{0}],流 [{1}],PUSH_PROMISE帧不应由客户端发送 http2Parser.processFrameSettings.ackWithNonZeroPayload=接收到带有ACK标志设置和有效负载的设置帧 http2Parser.processFrameWindowUpdate.debug=连接[{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 5c6efd124e..74c9de35ee 100644 --- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties +++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties @@ -93,6 +93,7 @@ jsp.error.invalid.implicit=[{0}]处标记文件的隐式TLD无效 jsp.error.invalid.implicit.version=[{0}]处标记文件的隐式TLD中定义的JSP版本无效。 jsp.error.invalid.scope=非法的scope属性值:[{0}](必须是page、request、session或application中的一个) jsp.error.invalid.tagdir=标签文件目录 [{0}] 不以"/WEB-INF/tags"开头 +jsp.error.invalid.varscope=无效的变量范围[{0}] jsp.error.invalid.version=为标签 [{0}] 定义了无效的 JSP 版本号 jsp.error.ise_on_clear=当缓存大小等于0时调用clear()函数是非法的 jsp.error.java.line.number=在生成的java文件中的第:[{0}]行发生错误:[{1}] @@ -212,6 +213,7 @@ jsp.error.tag.invalid.iselignored=Tag指令:对isELIgnored来说是无效值 jsp.error.tag.invalid.trimdirectivewhitespaces=Tag指令:trimDirectiveWhitespaces的值无效 jsp.error.tag.language.nonjava=标记指令:无效的语言属性。 jsp.error.tag.multi.pageencoding=Tag指令不能多次出现pageencoding +jsp.error.tagHandlerPool=无法创建tag处理程序池[{0}] jsp.error.tagdirective.badbodycontent=标签指令中的无效的内容体[{0}] jsp.error.tagfile.badSuffix=在文件路径[{0}]下找不到".tag"的后缀 jsp.error.tagfile.illegalPath=非法的标记文件路径:[{0}],必须以“/WEB-INF/tags”或“/META-INF/tags”开头。 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 6ecc2efa0d..f9630a5137 100644 --- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties @@ -32,6 +32,9 @@ hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成 messageBytes.illegalCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码,因为它超出了允许的0到255范围。 +toStringUtil.classpath.platform=JRE提供的类 +toStringUtil.classpath.unknown=未知-非URLClassLoader实例 + uDecoder.eof=文件结尾(EOF) uDecoder.isHexDigit=十六进制编码无效 uDecoder.noSlash=不允许使用编码的斜杠字符 diff --git a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties index 338328e4e6..290b7d8ab2 100644 --- a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties @@ -31,6 +31,7 @@ parameters.bytes=开始处理输入[{0}] parameters.copyFail=无法创建以调试日志记录为目的的原始参数值的副本 parameters.decodeFail.debug=字符解码失败.参数 [{0}]和值 [{1}]被忽略 parameters.decodeFail.info=字符解码失败。值为[{1}]的参数[{0}]已被忽略。请注意,此处引用的名称和值可能由于解码失败而损坏。使用调试级别日志记录查看原始的、未损坏的值。 +parameters.duplicateFail=创建查询参数副本失败 parameters.emptyChunk=忽略空参数块 parameters.fallToDebug=\n\ \ 注:更多的参数错误将以DEBUG级别日志进行记录。 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 f67415b0ba..480aad4456 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 @@ -55,5 +55,6 @@ sf.numeric.decimalInvalidFinal=十进制最后一个字符必须是数字 sf.numeric.decimalPartTooLong=小数点后超过3位 sf.numeric.decimalTooLong=小数位数超过了16个字符 sf.numeric.integerTooLong=一个整数中发现超过15位数字 +sf.numeric.integralPartTooLong=小数的整数部分超过了12位数字 sf.string.invalidCharacter=字符串中[{0}]字符无效 sf.string.invalidEscape=[{0}]字符不能被转义 diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties index c501e753ab..211e779d82 100644 --- a/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/net/openssl/ciphers/LocalStrings_zh_CN.properties @@ -18,3 +18,4 @@ opensslCipherConfigurationParser.effectiveCiphers=使用的密码:[{0}] opensslCipherConfigurationParser.unknownElement=密码字符串中的未知元素:[{0}]。 +opensslCipherConfigurationParser.unknownProfile=无法使用OpenSSL来解析配置文件[{0}],它将作为密码套件传递 diff --git a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties index 5c6de1d0f2..50a669b824 100644 --- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings_zh_CN.properties @@ -16,4 +16,70 @@ # Do not edit this file directly. # To edit translations see: https://tomcat.apache.org/getinvolved.html#Translations +engine.invalidOCSPURL=OCSP链接无效:[{0}] +engine.noSSLContext=无SSL上下文 engine.noSession=SSL会话ID不可用 +engine.nullBuffer=空缓冲区 +engine.nullBufferInArray=数组空缓冲区 +engine.nullCipherSuite=空密码套件 +engine.nullName=空值名称 +engine.nullValue=空值 +engine.ocspParseError=解析OCSP链接时错误 +engine.ocspRequestError=处理链接 [{0}]的OCSP请求出错 +engine.openSSLError=OpenSSL错误: [{0}] 消息: [{1}] +engine.oversizedPacket=加密包过大 +engine.unsupportedCipher=不支持的密码套件:[{0}] [{1}] +engine.unsupportedProtocol=不支持协议[{0}] + +openssl.X509FactoryError=获取X509工厂实例错误 +openssl.addedClientCaCert=添加客户端CA证书:[{0}] +openssl.applyConf=在SSL上下文中应用OpenSSLConfCmd +openssl.certificateVerificationFailed=证书验证失败 +openssl.checkConf=检查OpenSSLConf +openssl.doubleInit=SSL上下文已初始化,忽略 +openssl.errApplyConf=无法将OpenSSLConf应用于SSL上下文 +openssl.errCheckConf=检查OpenSSLConf时发生错误 +openssl.errMakeConf=无法创建OpenSSLConf上下文 [{0}] +openssl.errorAddingCertificate=向链中添加证书时错误:[{0}] +openssl.errorConfiguringLocations=配置CA证书位置错误:[{0}] +openssl.errorLoadingCertificate=加载证书错误:[{0}] +openssl.errorLoadingPassword=加载密码文件错误:[{0}] +openssl.errorLoadingPrivateKey=加载私钥错误:[{0}] +openssl.errorPrivateKeyCheck=私钥与证书公钥不匹配:[{0}] +openssl.errorSSLCtxInit=初始化SSL上下文错误 +openssl.keyManagerMissing=密钥管理器未找到 +openssl.makeConf=创建OpenSSLConf上下文 +openssl.noCACerts=未配置CA证书 +openssl.nonJsseCertificate=证书[{0}]或它的私钥[{1}]不能使用JSSE密钥管理器进行处理,将直接提供给OpenSSL +openssl.nonJsseChain=日志含义证书链[{0}]未指定或无效,JSSE需要一个有效的证书链,所以尝试直接使用OpenSSL +openssl.passwordTooLong=证书密码过长 +openssl.setCustomDHParameters=为密钥[{1}]设置自定义DH参数([{0}]比特) +openssl.setECDHCurve=设置键值[{1}]的ECDH曲线([{0}]) +openssl.trustManagerMissing=未找到信任管理器 + +opensslconf.applyCommand=OpenSSLConf应用命令(名称 [{0}], 值 [{1}]) +opensslconf.applyFailed=将OpenSSLConf应用到SSL上下文时失败 +opensslconf.badDirectory=命令名称[{0}]使用了丢失的目录[{1}]) +opensslconf.badFile=命令名称[{0}]使用已丢失或不可读的文件[{1}]) +opensslconf.checkCommand=OpenSSLConf检查命令 (名称 [{0}], 值 [{1}]) +opensslconf.checkFailed=检查OpenSSLConf [{0}]时失败 +opensslconf.commandError=OpenSSLConf 失败命令(名称 [{0}], 值 [{1}]) 导致错误 [{2}] +opensslconf.failedCommand=OpenSSLConf 失败命令(名称 [{0}], 值 [{1}]) 结果是 [{2}] - 将被忽略 +opensslconf.finishFailed=OpenSSLConf 结束失败结果是 [{0}] +opensslconf.noCommandName=OpenSSLConf 无命令名称 - 将被忽略 (命令值 [{0}]) +opensslconf.resultCommand=OpenSSLConf 命令 (名称 [{0}], 值 [{1}]) 返回 [{2}] +opensslconf.unknownCommandType=SSL_CONF 命令 [{0}] 未知类型 +opensslconf.unsupported=OpenSSL实现不支持OpenSSLConf + +openssllibrary.ciphersFailure=获取密码列表失败 +openssllibrary.currentFIPSMode=当前FIPS模式:[{0}] +openssllibrary.engineError=创建引擎错误 +openssllibrary.enterAlreadyInFIPSMode=AprLifecycleListener配置为强制进入FIPS模式,但库已处于FIPS模式[{0}] +openssllibrary.initializeFIPSFailed=进入FIPS模式失败 +openssllibrary.initializeFIPSSuccess=成功进入FIPS模式 +openssllibrary.initializedOpenSSL=成功使用FFM [{0}]初始化OpenSSL +openssllibrary.initializingFIPS=初始化FIPS模式... +openssllibrary.skipFIPSInitialization=已经处于FIPS模式;跳过FIPS初始化。 +openssllibrary.tooLateForFIPSMode=无法setFIPSMode: SSL已经初始化 +openssllibrary.tooLateForSSLEngine=无法setSSLEngine: SSL已经初始化 +openssllibrary.tooLateForSSLRandomSeed=无法setSSLRandomSeed: SSL已经初始化 diff --git a/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties index 81c4c43699..da3b8f24dd 100644 --- a/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties @@ -18,5 +18,9 @@ taskQueue.notRunning=执行器未运行,无法强制命令进入队列 +threadPoolExecutor.invalidKeepAlive=核心线程必须有正数的存活时间 threadPoolExecutor.queueFull=队列容量已满 +threadPoolExecutor.taskRejected=任务[{0}]被[{1}]拒绝 threadPoolExecutor.threadStoppedToAvoidPotentialLeak=停止线程[{0}],从而避免context停止后的潜在的内存泄漏 + +virtualThreadExecutor.taskRejected=任务[{0}]被[{1}]拒绝 diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties index d93bd244fa..637e66c5ca 100644 --- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties +++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties @@ -43,6 +43,8 @@ caseInsensitiveKeyMap.nullKey=不允许 Key 是 Null clientEndpointHolder.instanceCreationFailed=未能创建WebSocketEndpoint clientEndpointHolder.instanceRegistrationFailed=无法向InstanceManager注册Endpoint实例 +digestAuthenticator.algorithm=无法生成请求摘要[{0}] + futureToSendHandler.timeout=等待[{0}][{1}]完成后操作超时。 perMessageDeflate.alreadyClosed=转换器已经关闭且可能永远不会使用 diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b3ddd8eb8c..c1868288b5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -292,6 +292,12 @@ <update> Update JSign to 7.0. (markt) </update> + <add> + Improvements to French translations. (remm) + </add> + <add> + Improvements to Chinese translations 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