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
The following commit(s) were added to refs/heads/9.0.x by this push:
new a15c400 Fix Chinese translation of word "war"
a15c400 is described below
commit a15c400fff60d4b6d0940f8e6ad837326f58bfe5
Author: Yang Yang <[email protected]>
AuthorDate: Mon Sep 14 18:50:33 2020 +0800
Fix Chinese translation of word "war"
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 4 ++--
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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 6cc609c..6a229f8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -24,7 +24,7 @@ farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
-farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，战争[{1}]
+farmWarDeployer.msgRxDeploy=接收集群部署路径[{0}]，war[{1}]
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
@@ -34,7 +34,7 @@ farmWarDeployer.removeStart=群集范围内删除web应用程序[{0}]
farmWarDeployer.removeTxMsg=从[{0}]发送群集范围的取消部署
farmWarDeployer.renameFail=将 [{0}] 重命名为 [{1}] 失败
farmWarDeployer.sendEnd=发送群集war部署路径[{0}]，war[{1}]已完成。
-farmWarDeployer.sendFragment=将群集战争片段路径[{0}]，战争[{1}]发送到[{2}]
+farmWarDeployer.sendFragment=将群集war片段路径[{0}]，war[{1}]发送到[{2}]
farmWarDeployer.sendStart=发送集群war部署路径[{0}]，war[{1}]已启动
farmWarDeployer.servicingDeploy=应用程序[{0}]正在服务。再次触摸WAR文件[{1}]！
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 237a100..8155d5d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -128,7 +128,7 @@ hostConfig.docBaseUrlInvalid=所提供的部署目录无法用URL来表示
hostConfig.expand=正在扩展web应用程序存档文件[{0}]
hostConfig.expand.error=解压WEB应用程序文件[{0}]时异常
hostConfig.ignorePath=忽略appBase中的路径[{0}]以进行自动部署
-hostConfig.illegalWarName=战争名称[{0}]无效。存档将被忽略
+hostConfig.illegalWarName=war名称[{0}]无效。存档将被忽略
hostConfig.jmx.register=注册上下文[{0}]失败。
hostConfig.jmx.unregister=移除注册上下文[{0}]失败
hostConfig.reload=重新加载上下文[{0}]
@@ -143,7 +143,7 @@ listener.createFailed=未启用可选侦听器[{0}]
passwdUserDatabase.readFail=无法从/etc/passwd获取完整的用户集
tomcat.addWebapp.conflictChild=无法在[{0}]处部署到上下文路径[{1}]，因为存在上下文[{2}]
-tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将战争部署到上下文路径[{1}]
+tomcat.addWebapp.conflictFile=由于现有文件[{2}]的存在，无法在[{0}]将war部署到上下文路径[{1}]
tomcat.baseDirMakeFail=无法创建用作基本目录的目录{0}
tomcat.baseDirNotDir=基本目录指定的位置[{0}]不是一个目录
tomcat.defaultMimeTypeMappingsFail=无法加载默认MIME类型
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
