This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d62d35f Manually merge PR 446. Improve Chinese translations.
DigitalFatCat
d62d35f is described below
commit d62d35fd746e3c9af0a5b35d1b8ce9d96fc7014b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 2 21:34:47 2021 +0100
Manually merge PR 446. Improve Chinese translations. DigitalFatCat
https://github.com/apache/tomcat/pull/446
---
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../catalina/loader/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../catalina/users/LocalStrings_zh_CN.properties | 2 ++
.../coyote/http2/LocalStrings_zh_CN.properties | 8 +++---
java/org/apache/el/LocalStrings_zh_CN.properties | 31 ++++++++++++++++++++++
.../tomcat/util/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4 +--
11 files changed, 45 insertions(+), 10 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/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 8874fbb..a7834ac 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -53,7 +53,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 f11fac4..316bf25 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -68,7 +68,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/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 4143213..363b31a 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -60,3 +60,4 @@ userMBean.destroyError.role=销毁角色[{0}]MBean时发生异常
userMBean.destroyError.user=销毁用户[{0}]MBean时发生异常
userMBean.invalidGroup=无效的组名[{0}]
userMBean.invalidRole=无效的角色名[{0}]
+userMBean.saveError=保存操作时出错
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 740bfee..52dc891 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/users/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
index 9453bd4..8388a2e 100644
--- a/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+dataSourceUserDatabase.exception=访问数据库异常
+
memoryUserDatabase.fileClose=关闭 [{0}] 失败
memoryUserDatabase.fileDelete=无法删除 [{0}]
memoryUserDatabase.fileNotFound=指定用户数据库[{0}]未找到
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index e19aed3..b53acbc 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -71,8 +71,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}]
@@ -119,7 +118,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}]字节
@@ -148,8 +147,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/el/LocalStrings_zh_CN.properties
b/java/org/apache/el/LocalStrings_zh_CN.properties
index 9518411..d5093d6 100644
--- a/java/org/apache/el/LocalStrings_zh_CN.properties
+++ b/java/org/apache/el/LocalStrings_zh_CN.properties
@@ -13,13 +13,44 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+elSupport.coerce.nonAbstract=无法将LambdaExpression强制到函数接口[{0}]，因为方法[{1}]不是抽象的
+
error.cannotSetVariables=不能在工厂上设置变量
error.context.null=ELConect为空
+error.convert=无法将类型为[{1}]的[{0}]转换为[{2}]
+error.compare=无法将[{0}}]与[{1}]进行比较
+error.fnMapper.method=找不到函数[{0}]
+error.fnMapper.null=表达式使用函数，但未提供FunctionMapper
+error.fnMapper.paramcount=函数[{0}]指定了[{1}]参数，但声明了[{2}]
+error.function=调用函数[{0}]时出现问题
+error.function.tooManyMethodParameterSets=为函数[{0}]指定了多组参数
+error.identifier.noMethod=标识[{0}]为空，无法调用
+error.identifier.notjava=标识符[{0}]不是EL规范第1.19节要求的有效Java标识符（标识符::=Java语言标识符）。可以通过将系统属性org.apache.el.parser.SKIP_IDENTIFIER_CHECK设置为true来禁用此检查。
+error.identifier.notMethodExpression=Identity [{0}]未引用方法表达式实例，返回类型[{1}]
+error.invalidMethodExpression=不是有效的方法表达式[{0}]
+error.invoke.wrongParams=方法[{0}]在调用时入参为 [{1}],预期入参为 [{2}]
+error.invoke.tooFewParams=方法[{0}]在调用时入参为 [{1}],预期入参至少为 [{2}]
+error.lambda.tooManyMethodParameterSets=指定的方法参数集多于嵌套lambda表达式的集合
+error.lambda.wrongNestedState=嵌套状态只能设置一次
+error.method=无效的方法表达式：[{0}]
+error.method.ambiguous=找不到明确的方法：{0}。{1}({2})
+error.method.notfound=找不到方法：{0}。{1}({2})
error.method.nullParms=参数类型不能为null
+error.mixed=表达式不能同时包含 ''#{...}'' and ''${...}'' : [{0}]
+error.noFunctionMapperTarget=FunctionMapper目标不能为空
error.noVariableMapperTarget=VariableMapper目标不能为空
error.null=表达式不能为null
error.nullLocalName=本地名称不能为null
error.nullMethod=方法不能为null
+error.parseFail=解析表达式[{0}]失败
+error.resolver.unhandled=ELResolver未处理属性为[{1}]的类型：[{0}]
+error.resolver.unhandled.null=ELResolver无法处理标识符为[{0}]的空基对象
+error.syntax.set=Set操作的语法非法
+error.unreachable.base=目标不可达，标识符[{0}]解析为null
+error.unreachable.property=目标不可达，[{0}]返回null
error.value.expectedType=预期的类型不能为null
+error.value.literal.write=ValueExpression是文字，不可写：[{0}]
stream.compare.notComparable=Stream中的元素必须实现了Comparable接口
+stream.optional.empty=对空可选调用get()是非法的
+stream.optional.paramNotLambda=方法[{0}]的参数应为lambda表达式
diff --git a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
index 0498df4..e4ad10f 100644
--- a/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/LocalStrings_zh_CN.properties
@@ -25,7 +25,7 @@ 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_zh_CN.properties
b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 0b01791..0ebc3fe 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -25,6 +25,7 @@ asyncChannelWrapperSecure.eof=意外的流结尾
asyncChannelWrapperSecure.statusUnwrap=unwrap()操作后SSLEngineResult 的意外状态
asyncChannelWrapperSecure.statusWrap=wrap（）操作后SSLEngineResult的意外状态
asyncChannelWrapperSecure.tooBig=结果[{0}]太大，无法表示为整数
+asyncChannelWrapperSecure.unexpectedHandshakeState=TLS握手期间出现意外状态[{0}}]
asyncChannelWrapperSecure.wrongStateRead=尝试完成读取操作时，发现指示正在进行读取的标志为false（应该为true）
asyncChannelWrapperSecure.wrongStateWrite=尝试完成写操作时，发现指示正在进行写操作的标志为false（应该为true）
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c5f7d0..6e55bef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -250,8 +250,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 French translations. (remm)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
