This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2b9df06953 Improvements to Chinese translations
2b9df06953 is described below
commit 2b9df06953a76713d6d505c3e01d2d916159c1fd
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jan 12 09:25:48 2026 +0000
Improvements to Chinese translations
Provided by Yang. vincent.h and yong hu.
---
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/naming/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4 ++++
webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 29421d35bf..860e3f7c37 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -127,7 +127,7 @@ hostConfig.deployDir.error=无法部署应用目录 [{0}]
hostConfig.deployDir.finished=Web应用程序目录[{0}]的部署已在[{1}]毫秒内完成
hostConfig.deployDir.threaded.error=等待目录的多线程部署完成时出错
hostConfig.deployWar=正在部署web应用程序存档文件[{0}]
-hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
+hostConfig.deployWar.error=部署 Web 应用程序存档 [{0}] 时出错
hostConfig.deployWar.finished=web应用程序存档文件[{0}]的部署已在[{1}]ms内完成
hostConfig.deployWar.hiddenDir=将忽略目录[{0}],因为WAR [{1}]优先,unpackWAR为false
hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错
@@ -163,7 +163,7 @@ tomcat.invalidCommandLine=无效的命令行参数 [{0}]
tomcat.noContextClass=无法为主机[{1}]和url[{2}]实例化上下文类[{0}]
tomcat.noContextXml=不能找到web 应用的context.xml [{0}]
-userConfig.database=加载用户数据库异常
+userConfig.database=用户数据库加载异常
userConfig.deploy=正在为用户[{0}]部署web应用程序
userConfig.deploy.threaded.error=等待用户目录的多线程部署完成时出错
userConfig.deploying=正在部署用户 web 应用程序
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 209cdd0dc9..cfac47a6f7 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -149,6 +149,6 @@ requestFilterValve.deny=根据[{1}]配置拒绝[{0}]的请求
sslValve.certError=无法处理证书字符串[{0}]以创建java.security.cert.X509Certificate对象
sslValve.invalidProvider=与此[{0}]请求关联的连接器上指定的SSL提供程序无效。 无法处理证书数据。
-stuckThreadDetectionValve.notifyStuckThreadCompleted=线程[{0}](id=[{3}])之前报告为卡住,但是已经完成。它活跃了大概[{1}]毫秒。{2,选择,0#|0<
仍有[{2}]个被Valve监控的线程可能卡住}
+stuckThreadDetectionValve.notifyStuckThreadCompleted=线程[{0}](id=[{3}])之前报告为卡住,但是已经完成。它活跃了大概[{1}]毫秒。{2,choice,0#|0<
仍有[{2}]个被Valve监控的线程可能卡住}
stuckThreadDetectionValve.notifyStuckThreadDetected=线程[{0}](id=[{6}])已处于活动状态[{1}]毫秒(自[{2}]起),以便为[{4}]提供相同的请求,并且可能被卡住(此StuckThreadDetectionValve的配置阈值为[{5}]秒)。总共有[{3}]个线程受此阀监视,可能被卡住。
stuckThreadDetectionValve.notifyStuckThreadInterrupted=线程[{0}](id=[{5}])已被中断,因为它在[{1}]毫秒(自[{2}]起)内处于活动状态,以便为[{3}]提供相同的请求,并且可能被卡住(此StuckThreadDetectionValve的配置中断阈值为[{4}]秒)。
diff --git a/java/org/apache/naming/LocalStrings_zh_CN.properties
b/java/org/apache/naming/LocalStrings_zh_CN.properties
index 0246c46e59..11c71bf0ca 100644
--- a/java/org/apache/naming/LocalStrings_zh_CN.properties
+++ b/java/org/apache/naming/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@ contextBindings.noContextBoundToThread=没有绑定到此线程的命名上下
contextBindings.unknownContext=未知.上下文名:[{0}]
namingContext.alreadyBound=名称[{0}]已在此上下文中绑定
+namingContext.contextExpected=名称 [{0}] 未被绑定到一个域
namingContext.invalidName=名称无效
namingContext.nameNotBound=名称[{0}]未在此上下文中绑定。找不到[{1}]。
namingContext.noAbsoluteName=无法为此命名空间生成绝对名称
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9c6279ffb2..c1345b47ff 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,10 @@
<add>
Improvements to Japanese translations provided by tak7iji. (markt)
</add>
+ <add>
+ Improvements to Chinese translations provided by Yang. vincent.h and
+ yong hu. (markt)
+ </add>
</changelog>
</subsection>
</section>
diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
b/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
index 0a3027cfd2..288421b873 100644
--- a/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
+++ b/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
@@ -17,7 +17,7 @@
# To edit translations see:
https://tomcat.apache.org/getinvolved.html#Translations
cookies.cookies=你的浏览器正在发送下面的cookie:
-cookies.make-cookie=创建一个发送到你的浏览器的cookie
+cookies.make-cookie=创建一个cookie并发送到你的浏览器
cookies.name=名.称:
cookies.no-cookies=你的浏览器未发送任何cookie
cookies.set=你刚刚将以下cookie发送到你的浏览器:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]