You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/09/02 20:54:30 UTC
[tomcat] branch 8.5.x updated: More translation backports
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 2c761e3 More translation backports
2c761e3 is described below
commit 2c761e33ab2217cf257d08cb79d5c6b976011f74
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 2 21:52:22 2021 +0100
More translation backports
---
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/core/LocalStrings.properties | 2 +-
.../catalina/loader/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/valves/LocalStrings.properties | 2 --
.../coyote/http2/LocalStrings_zh_CN.properties | 8 +++-----
.../tomcat/util/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/LocalStrings.properties | 22 ++++------------------
webapps/docs/changelog.xml | 4 ++--
10 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index e5ce28b..90a61e9 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -28,5 +28,6 @@ jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+persistentProviderRegistrations.xmlFeatureEncoding=将JASPIC配置为允许XML配置文件中的java编码名称时出现异常。仅支持IANA编码名称。
simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 45495d0..3c5b58a 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -76,7 +76,7 @@ aprListener.aprInitError=The Apache Tomcat Native library failed to load. The er
aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], useOpenSSL [{1}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters [{2}], random [{3}].
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters [{2}], random [{3}], UDS [{4}].
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 0e2e42c..72d2d9d 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -54,7 +54,7 @@ webappClassLoader.stopped=非法访问：此Web应用程序实例已停止。无
webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
webappClassLoader.transformError=检测错误：无法转换类[{0}]，因为它的类文件格式是不合法的。
webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer API启动了名为[{1}]的TimerThread，但未能将其停止。 为防止内存泄漏，计时器（以及相关联的线程）已被强制取消。
-webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
+webappClassLoader.wrongVersion=(无法载入的类 [{0}])
webappClassLoaderParallel.registrationFailed=将org.apache.catalina.loader.ParallelWebappClassLoader注册为能够并行加载类失败
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 3bf1385..957e36c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -66,7 +66,7 @@ htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾
htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=密码
htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 4125d9a..bb38754 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字
dataSourceRealm.authenticateFailure=用户名[{0}]未成功验证
dataSourceRealm.authenticateSuccess=用户名[{0}]已成功通过身份验证。
dataSourceRealm.close=关闭数据库连接时发生异常
+dataSourceRealm.commit=关闭前提交连接异常
dataSourceRealm.exception=认证异常
dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。
dataSourceRealm.getRoles.exception=检索角色[{0}]异常
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 4e27b14..b7f38fc 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -26,8 +26,6 @@ accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use the system default character set.
accessLogValve.writeFail=Failed to write log message [{0}]
-# Default error page should not have '[' ']' symbols around substituted text fragments.
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
errorReportValve.description=Description
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 2cd9832..2160be3 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -69,8 +69,7 @@ http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然
http2Parser.processFrameHeaders.decodingFailed=对HTTP头进行HPACK解码时出错
http2Parser.processFrameHeaders.payload=连接：[{0}]，流：[{1}]，正在处理[{1}]大小的头文件负载
http2Parser.processFramePriority.invalidParent=连接[{0}]，流[{1}]，流可能不依赖于自身
-http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
-\n
+http2Parser.processFramePushPromise=请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符
http2Parser.processFrameSettings.ackWithNonZeroPayload=接收到带有ACK标志设置和有效负载的设置帧
http2Parser.processFrameWindowUpdate.debug=连接[{0}]，流[{1}]，窗口大小增量[{2}]
http2Parser.processFrameWindowUpdate.invalidIncrement=接收到的窗口更新帧具有无效的增量大小[{0}]
@@ -117,7 +116,7 @@ streamProcessor.error.stream=连接{0}，流{1}，处理过程中发生对流致
streamProcessor.flushBufferedWrite.entry=连接[{0}]，流[{1}]，正在刷新缓冲写入
streamProcessor.service.error=请求处理期间出错
-streamStateMachine.debug.change=(:连接[{0}]，流[{1}]，状态从[{2}]更改为[{3}]
+streamStateMachine.debug.change=连接[{0}]，流[{1}]，状态从[{2}]更改为[{3}]
streamStateMachine.invalidFrame=连接{0}、流{1}、状态{2}、帧类型{3}
upgradeHandler.allocate.debug=连接[{0}]，流[{1}]，已分配[{2}]字节
@@ -146,8 +145,7 @@ upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败
upgradeHandler.socketCloseFailed=关闭 socket 错误
upgradeHandler.startRequestBodyFrame.result=连接[{0}],流[{1}]startRequestBodyFrame返回[{2}]
upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间
-upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
-\n
+upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符
upgradeHandler.stream.notWritable=连接{0}，流{1}，此流不可写。
upgradeHandler.stream.old=请求了新的远程流ID [{0}]，但最近的流是[{1}]
upgradeHandler.tooManyRemoteStreams=客户端试图使用超过[{0}]个活动流。
diff --git a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
index dd7b475..d7191b0 100644
--- a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
@@ -25,6 +25,6 @@ diagnostics.vmInfoOs=操作系统信息
diagnostics.vmInfoPath=路径信息
diagnostics.vmInfoRuntime=运行时信息
diagnostics.vmInfoStartup=启动参数
-diagnostics.vmInfoSystem=系统.属性
+diagnostics.vmInfoSystem=系统属性
diagnostics.vmInfoThreadCounts=线程数
diagnostics.vmInfoThreadMxBean=ThreadMXBean功能
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties b/java/org/apache/tomcat/websocket/LocalStrings.properties
index fbd7bfd..d642228 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -52,10 +52,6 @@ util.invalidType=Unable to coerce value [{0}] to type [{1}]. That type is not su
util.notToken=An illegal extension parameter was specified with name [{0}] and value [{1}]
util.unknownDecoderType=The Decoder type [{0}] is not recognized
-# Note the wsFrame.* messages are used as close reasons in WebSocket control
-# frames and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
wsFrame.alreadyResumed=Message receiving has already been resumed.
wsFrame.alreadySuspended=Message receiving has already been suspended.
wsFrame.bufferTooSmall=No async message support and buffer too small. Buffer size: [{0}], Message size: [{1}]
@@ -103,14 +99,6 @@ wsRemoteEndpoint.tooMuchData=Ping or pong may not send more than 125 bytes
wsRemoteEndpoint.writeTimeout=Blocking write timeout
wsRemoteEndpoint.wrongState=The remote endpoint was in state [{0}] which is an invalid state for called method
-# Note the following messages are used as a close reason in a WebSocket control
-# frame and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
-wsSession.timeout=The WebSocket session [{0}] idle timeout expired
-wsSession.timeoutRead=The WebSocket session [{0}] read idle timeout expired
-wsSession.timeoutWrite=The WebSocket session [{0}] write idle timeout expired
-
wsSession.closed=The WebSocket session [{0}] has been closed and no method (apart from close()) may be called on a closed session
wsSession.created=Created WebSocket session [{0}]
wsSession.doClose=Closing WebSocket session [{0}]
@@ -124,15 +112,12 @@ wsSession.invalidHandlerTypePong=A pong message handler must implement MessageHa
wsSession.messageFailed=Unable to write the complete message as the WebSocket connection has been closed
wsSession.removeHandlerFailed=Unable to remove the handler [{0}] as it was not registered with this session
wsSession.sendCloseFail=Failed to send close message for session [{0}] to remote endpoint
+wsSession.timeout=The WebSocket session [{0}] idle timeout expired
+wsSession.timeoutRead=The WebSocket session [{0}] read idle timeout expired
+wsSession.timeoutWrite=The WebSocket session [{0}] write idle timeout expired
wsSession.unknownHandler=Unable to add the message handler [{0}] as it was for the unrecognised type [{1}]
wsSession.unknownHandlerType=Unable to add the message handler [{0}] as it was wrapped as the unrecognised type [{1}]
-# Note the following message is used as a close reason in a WebSocket control
-# frame and therefore must be 123 bytes (not characters) or less in length.
-# Messages are encoded using UTF-8 where a single character may be encoded in
-# as many as 4 bytes.
-wsWebSocketContainer.shutdown=The web application is stopping
-
wsWebSocketContainer.asynchronousSocketChannelFail=Unable to open a connection to the server
wsWebSocketContainer.connect.entry=Connecting endpoint instance of type [{0}] to [{1}]
wsWebSocketContainer.connect.write=Writing the HTTP upgrade request from buffer starting at [{0}] with a limit of [{1}] from local address [{2}]
@@ -153,5 +138,6 @@ wsWebSocketContainer.proxyConnectFail=Failed to connect to the configured Proxy
wsWebSocketContainer.redirectThreshold=Cyclic Location header [{0}] detected / reached max number of redirects [{1}] of max [{2}]
wsWebSocketContainer.responseFail=The HTTP upgrade to WebSocket failed but partial data may have been received: Status Code [{0}], HTTP headers [{1}]
wsWebSocketContainer.sessionCloseFail=Session with ID [{0}] did not close cleanly
+wsWebSocketContainer.shutdown=The web application is stopping
wsWebSocketContainer.sslEngineFail=Unable to create SSLEngine to support SSL/TLS connections
wsWebSocketContainer.unsupportedAuthScheme=Failed to handle HTTP response code [{0}]. Unsupported Authentication scheme [{1}] returned in response
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5cff909..cc61240 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -213,8 +213,8 @@
(markt)
</update>
<add>
- Improvements to Chinese translations contributed by syseal, wolibo and
- ZhangJieWen. (markt)
+ Improvements to Chinese translations contributed by syseal, wolibo,
+ ZhangJieWen and DigitalFatCat. (markt)
</add>
<add>
Improvements to Japanese translations contributed by tak7iji. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org