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 2019/08/15 14:13:18 UTC
[tomcat] branch master updated (ef8ccbeb -> 424e3fe)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from ef8ccbeb Add utility to back-port translation updates
new 06c7f44 Update French translations
new 424e3fe Additional simplified Chinese translations by leeyazhou
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../connector/LocalStrings_zh_CN.properties | 2 +
.../catalina/core/LocalStrings_fr.properties | 1 +
.../catalina/core/LocalStrings_zh_CN.properties | 6 ++
.../ha/deploy/LocalStrings_zh_CN.properties | 2 +
.../ha/session/LocalStrings_zh_CN.properties | 5 +
.../catalina/manager/LocalStrings_zh_CN.properties | 117 +++++++++++++++++++++
.../manager/host/LocalStrings_zh_CN.properties | 38 ++++++-
.../catalina/mapper/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../servlets/LocalStrings_zh_CN.properties | 2 +
.../catalina/session/LocalStrings_zh_CN.properties | 3 +
.../catalina/startup/LocalStrings_zh_CN.properties | 6 +-
.../tribes/group/LocalStrings_zh_CN.properties | 1 +
.../interceptors/LocalStrings_zh_CN.properties | 2 +
.../membership/LocalStrings_zh_CN.properties | 3 +
.../membership/cloud/LocalStrings_zh_CN.properties | 5 +-
.../tribes/tipis/LocalStrings_zh_CN.properties | 1 +
.../transport/nio/LocalStrings_zh_CN.properties | 4 +
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/users/LocalStrings_zh_CN.properties | 1 +
.../webresources/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 2 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 5 +
.../jasper/resources/LocalStrings_zh_CN.properties | 4 +
.../naming/factory/LocalStrings_fr.properties | 4 +
.../naming/factory/LocalStrings_zh_CN.properties | 2 +
.../tomcat/util/buf/LocalStrings_fr.properties | 3 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/http/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/net/LocalStrings_zh_CN.properties | 5 +-
.../util/net/jsse/LocalStrings_fr.properties | 2 +
.../util/net/openssl/LocalStrings_fr.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 13 +++
34 files changed, 240 insertions(+), 7 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Update French translations
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 06c7f4444d57e20986d39832c77662f106f47938
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 15:10:59 2019 +0100
Update French translations
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 1 +
java/org/apache/naming/factory/LocalStrings_fr.properties | 4 ++++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 3 +++
java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties | 2 ++
.../org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties | 1 +
webapps/docs/changelog.xml | 8 ++++++++
6 files changed, 19 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index f4bb7d9..d5c9892 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -92,6 +92,7 @@ aprListener.tooLateForSSLRandomSeed=setSSLRandomSeed impossible: SSL a déjà é
aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de AprLifecycleListener: [{0}]
asyncContextImpl.asyncDispachError=Erreur lors d'un dispatch asynchrone
+asyncContextImpl.asyncRunnableError=Erreur lors du traitement asynchrone du Runnable via AsyncContext.start()
asyncContextImpl.dispatchingStarted=Une opération de dispatch asynchrone a déjà été appelée, plusieurs dispatch au cours d'un même cycle asynchrone n'est pas autorisé
asyncContextImpl.noAsyncDispatcher=Le Servlet dispatcher retourné par le ServletContext ne supporte pas de dispatch asynchrone
asyncContextImpl.onCompleteError=L''appel à onComplete() a échoué pour l''écouteur de type [{0}]
diff --git a/java/org/apache/naming/factory/LocalStrings_fr.properties b/java/org/apache/naming/factory/LocalStrings_fr.properties
index 18cc08f..e427e8b 100644
--- a/java/org/apache/naming/factory/LocalStrings_fr.properties
+++ b/java/org/apache/naming/factory/LocalStrings_fr.properties
@@ -15,6 +15,10 @@
dataSourceLinkFactory.badWrapper=Pas un enrobeur pour le type [{0}]
+factoryBase.factoryClassError=Impossible de charger la classe de la fabrique de ressources
+factoryBase.factoryCreationError=Impossible de créer l'instance de la fabrique de ressources
+factoryBase.instanceCreationError=Impossible de créer l'instance de la ressource
+
lookupFactory.circularReference=Trouvé une référence circulaire avec [{0}]
lookupFactory.createFailed=Echec de création de l'instance de la classe de fabrique de recherche JNDI
lookupFactory.loadFailed=Echec de chargement de la classe de fabrique de recherche JNDI
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index f05a942..c62f2f5 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+asn1Parser.lengthInvalid=Une longueur d''octets invalide [{0}] a été rapportée alors que la longueur de données en entrée est de [{1}] octets
+asn1Parser.tagMismatch=La valeur [{0}] était attendue mais la valeur [{1}] a été rencontrée
+
b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas supporté
byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de ByteBuffers directs, une fuite de mémoire peut se produire
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 14ce0ce..36dae5f 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -35,3 +35,5 @@ jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option de c
jsseUtil.noVerificationDepth=Le truststoreProvider [{0}] ne supporte pas l''option de configuration certificateVerificationDepth
jsseUtil.trustedCertNotChecked=Les dates de validité du certificat de confiance dont l''alias est [{0}] n''ont pas été vérifiées car sont type est inconnu
jsseUtil.trustedCertNotValid=Le certificat de confiance avec l''alias [{0}] et le DN [{1}] n''est pas valide à cause de [{2}], les certificats signés par ce certificat de confiance SERONT acceptés
+
+pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce format
diff --git a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
index b9238be..ecdf34a 100644
--- a/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
@@ -51,6 +51,7 @@ openssl.errorSSLCtxInit=Erreur d'initialisation du contexte SSL
openssl.keyManagerMissing=Aucun gestionnaire de clés trouvé
openssl.makeConf=Création du contexte de OpenSSLConf
openssl.nonJsseCertficate=Le certificat [{0}] ou sa clé privée [{1}] n''a pas pu être traité en utilisant un gestionnaire de clé de JSSE, et sera directement passée à OpenSSL
+openssl.nonJsseChain=La chaîne de certificat [{0}] n''a pas été spécifiée ou est invalide et JSSE requiert une chaîne de certificats valide, donc OpenSSL sera utilisé directement
openssl.trustManagerMissing=Gestionnaire de confiance non trouvé
opensslconf.applyCommand=Application de la commande OpenSSLConf (nom [{0}] valeur [{1}])
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 755aa98..4be027c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.25 (markt)" rtext="in development">
+ <subsection name="Other">
+ <changelog>
+ <add>
+ Expand the coverage and quality of the French translations provided
+ with Apache Tomcat. (remm)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.24 (markt)" rtext="release in progress">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Additional simplified Chinese translations by
leeyazhou
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 424e3fe186b60b8a932637fc2cb2c81a7ec294f5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 15:12:57 2019 +0100
Additional simplified Chinese translations by leeyazhou
---
.../connector/LocalStrings_zh_CN.properties | 2 +
.../catalina/core/LocalStrings_zh_CN.properties | 6 ++
.../ha/deploy/LocalStrings_zh_CN.properties | 2 +
.../ha/session/LocalStrings_zh_CN.properties | 5 +
.../catalina/manager/LocalStrings_zh_CN.properties | 117 +++++++++++++++++++++
.../manager/host/LocalStrings_zh_CN.properties | 38 ++++++-
.../catalina/mapper/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../servlets/LocalStrings_zh_CN.properties | 2 +
.../catalina/session/LocalStrings_zh_CN.properties | 3 +
.../catalina/startup/LocalStrings_zh_CN.properties | 6 +-
.../tribes/group/LocalStrings_zh_CN.properties | 1 +
.../interceptors/LocalStrings_zh_CN.properties | 2 +
.../membership/LocalStrings_zh_CN.properties | 3 +
.../membership/cloud/LocalStrings_zh_CN.properties | 5 +-
.../tribes/tipis/LocalStrings_zh_CN.properties | 1 +
.../transport/nio/LocalStrings_zh_CN.properties | 4 +
.../tribes/util/LocalStrings_zh_CN.properties | 1 +
.../catalina/users/LocalStrings_zh_CN.properties | 1 +
.../webresources/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 2 +-
.../coyote/http2/LocalStrings_zh_CN.properties | 5 +
.../jasper/resources/LocalStrings_zh_CN.properties | 4 +
.../naming/factory/LocalStrings_zh_CN.properties | 2 +
.../tomcat/util/buf/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/http/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/net/LocalStrings_zh_CN.properties | 5 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 5 +
29 files changed, 221 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
index 650fd7f..835e729 100644
--- a/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_zh_CN.properties
@@ -19,6 +19,7 @@ coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数，url中
coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别，Connector 将继续使用 [{1}]
coyoteConnector.invalidPort=连接器不能启动，因为指定的端口 [{0}]无效
+coyoteConnector.parseBodyMethodNoTrace=方法TRACE禁止包含实体（详情查看RFC 2616 章节 9.6）
coyoteConnector.protocolHandlerInstantiationFailed=协议处理程序实例化失败
coyoteConnector.protocolHandlerNoAprLibrary=配置的协议[{0}]需要不可用的APR/本机库
coyoteConnector.protocolHandlerNoAprListener=配置的协议[{0}]需要不可用的aprlifecycleListener
@@ -28,6 +29,7 @@ coyoteConnector.protocolHandlerStopFailed=协议处理程序.停止失败
coyoteInputStream.nbNotready=在非阻塞模式下，只有之前的读数据完成，并且isReady()方法返回true，你才可以使用 ServletInputStream 读取数据
coyoteRequest.changeSessionId=无法更改 session ID。 没有与此请求关联的 session。
+coyoteRequest.chunkedPostTooLarge=由于请求参数数据太大，导致参数不能解析。因为当前请求是块状请求，后续也不会处理。如果应用程序需要接收大的POST请求，可以使用连接器的maxPostSize解决它。
coyoteRequest.filterAsyncSupportUnknown=无法确定是否有任何过滤器不支持异步处理
coyoteRequest.gssLifetimeFail=为用户主体 [{0}] 获取剩余生命期失败
coyoteRequest.noMultipartConfig=由于没有提供multi-part配置，无法处理parts
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index 01d4c4d..cd0a37b 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -52,9 +52,11 @@ filterChain.filter=Filter 执行抛出一个异常
naming.addEnvEntry=添加环境条目 [{0}]
naming.addResourceEnvRef=添加资源环境引用 [{0}]
naming.invalidEnvEntryType=环境条目[{0}]没有一个有效哦的类型
+naming.jmxRegistrationFailed=注册到JMX失败：[{0}]
naming.namingContextCreationFailed=创建上下文名称失败
naming.wsdlFailed=未找到 wsdl 文件：[{0}]
+standardContext.applicationListener=配置应用程序监听器[{0}]错误
standardContext.backgroundProcess.resources=异常处理资源[{0}] 后台进程
standardContext.cookieProcessor.null=不允许将上下文的CookieProcessor 设置为null
standardContext.errorPage.required=ErrorPage不能为null
@@ -69,19 +71,23 @@ standardContext.listenerStart=异常将上下文初始化事件发送到类的
standardContext.loginConfig.errorPage=表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.errorWarning=警告：Servlet 2.4中，表单错误页[{0}]必须以"/"开始
standardContext.loginConfig.loginPage=表单登录页面 [{0}] 必须以''/''开头
+standardContext.manager=配置类为[{0}]的管理器
standardContext.managerFail=会话管理器无法启动
standardContext.namingResource.init.fail=未能初始化新的命名资源
standardContext.notStarted=名为[{0}]的上下文还没有被启动
standardContext.parameter.duplicate=重复的上下文初始化参数[{0}]
standardContext.predestroy.duplicate=类 [{0}] 的 @PreDestroy 方法定义重复
+standardContext.resourcesInit=初始化静态变量错误
standardContext.resourcesStart=启动静态资源出错
standardContext.resourcesStop=停止静态资源时出错
standardContext.securityConstraint.mixHttpMethod=在相同的web资源集合中不允许混用: <http-method> 和 <http-method-omission>
standardContext.securityConstraint.pattern=安全约束中的<url-pattern> [{0}] 无效
standardContext.servletFail=启动时无法加载一个或多个Servlet。 全部的详细信息可在相应的容器日志文件中找到
+standardContext.startingContext=启动Context[{0}]出现异常
standardContext.stop.asyncWaitInterrupted=等待卸载延迟毫秒以完成飞行中的异步请求时收到中断。上下文停止将继续，不会有进一步的延迟。
standardContext.stoppingContext=异常停止的上下文使用名为[{0}]
standardContext.unknownCookieEncoding=为setCookieEncoding(String)指定了未知编码[{0}]，因此将使用默认的UTF-8。
+standardContext.workCreateFail=无法为上下文[{1}]创建工作目录[{0}]
standardContextValve.acknowledgeException=以100（继续）响应确认请求失败
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 ad43e4c..caa19d2 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -18,6 +18,7 @@ farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
farmWarDeployer.modInstallFail=无法安装 WAR 文件
farmWarDeployer.msgIoe=无法读取服务器场部署文件消息。
farmWarDeployer.msgRxUndeploy=从路径[{0}]接收未部署群集
+farmWarDeployer.removeFailLocal=从[{0}]本地移除失败
farmWarDeployer.removeFailRemote=本地从[{0}]删除失败，其他经理有app在服务！
farmWarDeployer.removeLocalFail=无法移除WAR文件
farmWarDeployer.servicingUndeploy=正在处理应用程序[{0}]，无法从备份群集节点中删除它
@@ -27,4 +28,5 @@ farmWarDeployer.undeployLocal=不能部署本地上下文[{0}]
fileMessageFactory.deleteFail=无法删除 [{0}]
warWatcher.cantListWatchDir=无法列出WatchDir文件夹 [{0}] 中的文件：检查该路径是否为目录且应用具有读取权限。
+warWatcher.checkWarResult=WarInfo.check() 为[{1}]返回[{0}]
warWatcher.checkingWar=检查 WAR 文件 [{0}]
diff --git a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
index 3f73ff4..4b3fe53 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings_zh_CN.properties
@@ -14,6 +14,8 @@
# limitations under the License.
backupManager.noCluster=没有与此上下文关联的集群：[{0}]
+backupManager.startFailed=启动BackupManager: [{0}]失败
+backupManager.startUnable=无法启动BackupManager: [{0}]
backupManager.stopped=管理者[{0}]正在停止。
deltaManager.createSession.newSession=用id[{0}]创建一个扩展会话(DeltaSession)，总数为 [{1}]
@@ -34,4 +36,7 @@ deltaRequest.removeUnable=不能移除元素
deltaRequest.showPrincipal=Principal [{0}] 和session [{1}]产生关联。
deltaRequest.wrongPrincipalClass=ClusterManager仅支持GenericPrincipal。 你的Realm使用的Principal类为[{0}]。
+deltaSession.writeSession=writeObject()存储会话[{0}]
+
+jvmRoute.changeSession=会话从[{0}]切换到[{1}]
jvmRoute.notFoundManager=没有在 [{0}] 找到Cluster Manager
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 427d327..6478e3d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -19,59 +19,176 @@ htmlManagerServlet.appsName=显示.名称
htmlManagerServlet.appsPath=路径
htmlManagerServlet.appsReload=重新加载
htmlManagerServlet.appsSessions=会话
+htmlManagerServlet.appsStart=启动
+htmlManagerServlet.appsStop=停止
htmlManagerServlet.appsTasks=命令
+htmlManagerServlet.appsTitle=应用程序
+htmlManagerServlet.appsUndeploy=卸载
+htmlManagerServlet.appsVersion=版本号
htmlManagerServlet.configReloadButton=重复读
htmlManagerServlet.configSslHostName=TLS 主机名字（可选)
htmlManagerServlet.configSslReloadTitle=重新读取 TLS 配置文件
+htmlManagerServlet.configTitle=配置
+htmlManagerServlet.connectorStateAliveSocketCount=存活套接字总数：
+htmlManagerServlet.connectorStateBytesRecieved=收到字节：
htmlManagerServlet.connectorStateBytesSent=发送.字节:
+htmlManagerServlet.connectorStateErrorCount=错误数：
+htmlManagerServlet.connectorStateHint=P：解析和准备request S：服务 F：结束 R：就绪 K：存活
+htmlManagerServlet.connectorStateMaxProcessingTime=最大处理时间：
+htmlManagerServlet.connectorStateMaxThreads=最大线程：
htmlManagerServlet.connectorStateProcessingTime=处理时间：
+htmlManagerServlet.connectorStateRequestCount=请求总数：
+htmlManagerServlet.connectorStateTableTitleBRecv=接收字节
+htmlManagerServlet.connectorStateTableTitleBSent=发送字节：
+htmlManagerServlet.connectorStateTableTitleClientAct=客户端（实际）
htmlManagerServlet.connectorStateTableTitleClientForw=客户端（转发）
htmlManagerServlet.connectorStateTableTitleRequest=请求
+htmlManagerServlet.connectorStateTableTitleStage=阶段
htmlManagerServlet.connectorStateTableTitleTime=时间
htmlManagerServlet.connectorStateTableTitleVHost=虚拟主机
+htmlManagerServlet.connectorStateThreadBusy=当前线程繁忙：
htmlManagerServlet.connectorStateThreadCount=当前线程数：
htmlManagerServlet.deployButton=:)部署
+htmlManagerServlet.deployConfig=XML配置文件路径：
+htmlManagerServlet.deployPath=Context路径：
htmlManagerServlet.deployServer=服务器上.部署的目录或WAR文件
htmlManagerServlet.deployTitle=部署
+htmlManagerServlet.deployUpload=要部署的WAR文件
+htmlManagerServlet.deployUploadFail=失败 - 部署上传失败，异常信息：[{0}]
+htmlManagerServlet.deployUploadFile=选择要上传的WAR文件
+htmlManagerServlet.deployUploadInServerXml=失败 - 如果context是定义在server.xml中，War文件[{0}]无法上传
htmlManagerServlet.deployUploadNoFile=失败 - 文件上传失败，没有文件
+htmlManagerServlet.deployUploadNotWar=失败 - 上传的文件[{0}]必须是一个.war文件
htmlManagerServlet.deployUploadWarExists=失败 - War文件 [{0}] 已存在于服务器上
+htmlManagerServlet.deployVersion=版本号（并行部署）
htmlManagerServlet.deployWar=WAR文件或文件夹路径：
htmlManagerServlet.diagnosticsLeak=检查Web应用程序是否在停止、重新加载或取消部署时导致内存泄漏
+htmlManagerServlet.diagnosticsLeakButton=发现泄漏
+htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾收集，在生产系统中使用时要格外小心。
+htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
+htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
+htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
+htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
htmlManagerServlet.diagnosticsTitle=诊断
+htmlManagerServlet.error.idleParam=无法解析整数闲置参数[{0}]
+htmlManagerServlet.error.sessions=错误的处理会话的命令，context [{0}]
+htmlManagerServlet.error.sortOrder=未知排序[{0}]
+htmlManagerServlet.expire.explain=闲置 ≥
htmlManagerServlet.expire.unit=分钟
+htmlManagerServlet.findleaksList=以下web应用程序已停止（重新加载、卸载），但是它们的类仍然加载在内存中，因此导致了内存泄漏（使用分析器确认）：
+htmlManagerServlet.findleaksNone=似乎没有任何Web应用程序在停止、重新加载或取消部署时触发内存泄漏。
htmlManagerServlet.helpHtmlManager=HTML管理器帮助
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=管理者帮助
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
htmlManagerServlet.jvmFreeMemory=剩余内存：
+htmlManagerServlet.jvmMaxMemory=最大内存
+htmlManagerServlet.jvmTableTitleInitial=初始化
htmlManagerServlet.jvmTableTitleMaximum=最大.值
htmlManagerServlet.jvmTableTitleMemoryPool=内存.池
+htmlManagerServlet.jvmTableTitleTotal=总共
+htmlManagerServlet.jvmTableTitleType=类型
+htmlManagerServlet.jvmTableTitleUsed=已用
htmlManagerServlet.jvmTotalMemory=总内存
+htmlManagerServlet.list=应用程序列表
htmlManagerServlet.manager=管理器
+htmlManagerServlet.messageLabel=消息：
htmlManagerServlet.noManager=-
htmlManagerServlet.noVersion=未指定
+htmlManagerServlet.osAvailableMemory=可用内存：
+htmlManagerServlet.osFreePageFile=可用页文件：
+htmlManagerServlet.osKernelTime=内核处理时间：
+htmlManagerServlet.osMemoryLoad=加载内存：
+htmlManagerServlet.osPhysicalMemory=物理内存
+htmlManagerServlet.osTotalPageFile=最大页文件：
+htmlManagerServlet.osUserTime=用户态处理实际：
htmlManagerServlet.serverHostname=主机名
htmlManagerServlet.serverIPAddress=IP地址
+htmlManagerServlet.serverJVMVendor=JVM提供商
htmlManagerServlet.serverJVMVersion=JVM.版本
+htmlManagerServlet.serverOSArch=操作系统架构
htmlManagerServlet.serverOSName=OS.名称
+htmlManagerServlet.serverOSVersion=操作系统版本
htmlManagerServlet.serverTitle=服务器信息
htmlManagerServlet.serverVersion=Tomcat.版本
+htmlManagerServlet.title=Tomcat Web应用程序管理者
managerServlet.alreadyContext=失败 - 应用程序已存在于路径 [{0}]
+managerServlet.certsNotAvailable=在运行期，无法从连接器中获取认证信息
+managerServlet.copyError=无法从路径[{0}]拷贝配置文件
+managerServlet.deleteFail=失败 - 不能删除[{0}]。这个文件一直存在会出现问题。
managerServlet.deployFailed=FAIL - 在上下文路径[{0}]下部署应用失败
managerServlet.deployed=OK - 以应用path [{0}] 部署应用
+managerServlet.deployedButNotStarted=失败 - 在上下文[{0}]下部署应用程序，但是上下文启动失败。
+managerServlet.error.deploy=部署[{0}]错误
+managerServlet.error.idleParam=无法解析闲置整数参数[{0}]
+managerServlet.error.reload=重新加载[{0}]错误
+managerServlet.error.resources=显示类型[{0}]的资源错误
+managerServlet.error.serverInfo=显示服务器信息错误
+managerServlet.error.sessions=显示上下文[{0}]的会话信息错误
+managerServlet.error.start=启动[{0}]失败
+managerServlet.error.stop=停止[{0}]错误
+managerServlet.error.storeConfig=保存配置错误
+managerServlet.error.storeContextConfig=上下文[{0}]存储配置错误
+managerServlet.error.undeploy=卸载[{0}]错误
+managerServlet.exception=失败 - 发生异常[{0}]
+managerServlet.findleaksFail=失败 - 查找泄漏失败：主机非StandardHost示例
+managerServlet.findleaksList=OK - 在以下应用程序中发现潜在的内存泄漏
managerServlet.findleaksNone=OK - 没有发现内存泄漏
+managerServlet.inService=失败 - 应用程序[{0}]已服务
+managerServlet.invalidCommand=失败 - 无效参数，命令[{0}]
+managerServlet.invalidPath=失败 - 指定了无效到上下文路径[{0}]
+managerServlet.listed=OK - 虚拟主机[{0}]下的应用程序列表
+managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.mkdirFail=失败 - 无法创建目录 [{0}]
managerServlet.noCommand=失败 - 未指定命令
+managerServlet.noContext=失败 - 上下文环境[{0}]不存在
managerServlet.noGlobal=失败 - 没有可用的全局 JNDI 资源
+managerServlet.noManager=失败 - 路径[{0}]下无管理器存在
+managerServlet.noSelf=失败 - 管理器不能重新加载、卸载、停止或者卸载它自身
+managerServlet.noWrapper=容器未为当前servlet调用setWrapper()
+managerServlet.notDeployed=失败 - 上下文[{0}]定义在server.xml中且可能未卸载
managerServlet.notSslConnector=不允许SSL连接
managerServlet.objectNameFail=FAIL - 不能将为Manager Servlet 注册 object name [{0}]
managerServlet.postCommand=失败 - 尝试通过GET请求使用命令[{0}]，但需要POST
+managerServlet.reloaded=OK - 上下文路径[{0}]重新加载应用程序
+managerServlet.renameFail=失败 - 无法重命名[{0}]为[{1}]，这可能这未来部署时出现问题。
managerServlet.resourcesAll=OK - 列出所有类型的全部资源
managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
managerServlet.saveFail=失败 - 配置保存失败：[{0}]
+managerServlet.saved=OK - 服务器配置已保存
+managerServlet.savedContext=OK - 上下文[{0}]配置已保存
+managerServlet.serverInfo=OK - 服务器信息\n\
+Tomcat版本: [{0}]\n\
+操作系统名称: [{1}]\n\
+操作系统版本: [{2}]\n\
+操作系统架构: [{3}]\n\
+JVM版本: [{4}]\n\
+JVM提供商: [{5}]
+managerServlet.sessiondefaultmax=最大会话时间失活间隔是[{0}]分钟
+managerServlet.sessions=OK - 上下文路径[{0}]的会话信息
+managerServlet.sessiontimeout=失活[{0}]分钟：[{1}]会话
+managerServlet.sessiontimeout.expired=失活[{0}]分钟：[{1}]会话过期
+managerServlet.sessiontimeout.unlimited=无限制到时间：[{0}]会话
+managerServlet.sslConnectorCerts=OK - 连接器/认证链信息
managerServlet.sslConnectorCiphers=OK - Connector/SSL 密码.信息
+managerServlet.sslConnectorTrustedCerts=OK - 连接器/认证证书信息
+managerServlet.sslReload=OK - 为[{0}]重新加载TLS配置
+managerServlet.sslReloadAll=OK - 未所有TLS虚拟主机重新加载TLS配置
managerServlet.sslReloadFail=FAIL - 重新加载TLS配制失败
+managerServlet.startFailed=失败 - 上下文路径[{0}]下，应用程序无法启动
+managerServlet.started=OK - 在上下文路径[{0}]下启动应用程序
+managerServlet.stopped=OK - 上下文路径[{0}]下停止应用程序
+managerServlet.storeConfig.invalidMBean=失败 - 未能找到StoreConfig Mbean。对MBean来说，[{0}]是无效的名称。
+managerServlet.storeConfig.noMBean=失败 - [{0}]未发现注册的StoreConfig MBean，注册一般是由StoreConfigLifecycleListener执行的。
+managerServlet.threaddump=OK - JVM线程转储
managerServlet.trustedCertsNotConfigured=没有为此虚拟主机配置受信任的证书
managerServlet.undeployed=OK - 未部署的应用位于上下文路径[{0}]
managerServlet.unknownCommand=FAIL - 未知命令 [{0}]
managerServlet.vminfo=OK - VM信息
+
+statusServlet.complete=完整的服务器状态
+statusServlet.title=服务器状态
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 d5b2c0b..fae906d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties
@@ -13,44 +13,78 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+hostManagerServlet.add=添加：添加主机[{0}]
hostManagerServlet.addFailed=失败 - 添加主机 [{0}] 失败
hostManagerServlet.addSuccess=确定-添加主机[{0}]
+hostManagerServlet.alreadyHost=失败 - 主机名称[{0}]已经存在
hostManagerServlet.alreadyStarted=失败 - Host[{0}]已经启动。
+hostManagerServlet.alreadyStopped=失败 - 主机[{0}]已经停止
+hostManagerServlet.appBaseCreateFail=失败 - 创建appBase目录[{0}]失败，主机：[{1}]
+hostManagerServlet.cannotRemoveOwnHost=失败 - 无法移除你的主机[{0}]
+hostManagerServlet.cannotStartOwnHost=失败 - 无法启动主机[{0}]
+hostManagerServlet.cannotStopOwnHost=失败 - 无法停止主机[{0}]
hostManagerServlet.configBaseCreateFail=失败 - 无法识别主机[{0}]的基础配置
+hostManagerServlet.exception=失败 - 出现异常[{0}]
+hostManagerServlet.invalidHostName=失败 - 指定的主机名称[{0}]无效
+hostManagerServlet.list=列表：列出引擎[{0}]的主机
hostManagerServlet.listed=OK - 已列出Host
hostManagerServlet.listitem=[{0}]:[{1}]
hostManagerServlet.managerXml=FAIL - 无法安装manager.xml
hostManagerServlet.noCommand=失败 - 未指定命令
+hostManagerServlet.noHost=失败 - 主机名称[{0}]不存在
+hostManagerServlet.noWrapper=容器未给当前servlet设置setWrapper()
hostManagerServlet.persist=持久化: 正在持久化当前配置
hostManagerServlet.persistFailed=失败 - 无法持久化配置
hostManagerServlet.persisted=OK - 配置持久化了.
+hostManagerServlet.postCommand=失败 - 尝试通过GET请求使用命令[{0}]，但是需要使用POST请求
hostManagerServlet.remove=移除:正在移除主机 [{0}]
hostManagerServlet.removeFailed=失败 - 无法移除主机 [{0}]
hostManagerServlet.removeSuccess=确定-已删除主机[{0}]
+hostManagerServlet.start=启动：启动主机[{0}]
hostManagerServlet.startFailed=失败 - 无法启动主机 [{0}]
hostManagerServlet.started=OK - 主机 [{0}] 已启动
+hostManagerServlet.stop=停止：停止主机[{0}]
hostManagerServlet.stopFailed=失败 - 无法停止主机 [{0}]
hostManagerServlet.stopped=OK - 主机 [{0}] 已停止
-hostManagerServlet.unknownCommand=FAIL - 未知命令 [{0}]
+hostManagerServlet.unknownCommand=失败 - 未知命令 [{0}]
+htmlHostManagerServlet.addAliases=别名：
htmlHostManagerServlet.addAppBase=应用程序库：
htmlHostManagerServlet.addAutoDeploy=自动.部署
+htmlHostManagerServlet.addButton=添加
htmlHostManagerServlet.addCopyXML=拷贝XML
htmlHostManagerServlet.addDeployOnStartup=启动.部署
+htmlHostManagerServlet.addDeployXML=部署XML
htmlHostManagerServlet.addHost=主机
htmlHostManagerServlet.addManager=管理 App
+htmlHostManagerServlet.addName=名称
htmlHostManagerServlet.addTitle=添加.虚拟主机
+htmlHostManagerServlet.addUnpackWARs=解压WARs
+htmlHostManagerServlet.helpHtmlManager=HTML主机管理器帮助
htmlHostManagerServlet.helpHtmlManagerFile=../docs/html-host-manager-howto.html
+htmlHostManagerServlet.helpManager=主机管理器帮助
htmlHostManagerServlet.helpManagerFile=../docs/host-manager-howto.html
htmlHostManagerServlet.hostAliases=主机别名
htmlHostManagerServlet.hostName=主机名
+htmlHostManagerServlet.hostTasks=命令
+htmlHostManagerServlet.hostThis=主机管理器已安装 - 命令不可用
htmlHostManagerServlet.hostsPersist=持久化
htmlHostManagerServlet.hostsRemove=移除
+htmlHostManagerServlet.hostsStart=启动
htmlHostManagerServlet.hostsStop=停止
+htmlHostManagerServlet.list=列出虚拟主机
htmlHostManagerServlet.manager=主机.管理器
+htmlHostManagerServlet.messageLabel=消息：
+htmlHostManagerServlet.persistAll=保存当前配置信息（包括虚拟主机）到server.xml和每个web应用程序context.xml文件里。
+htmlHostManagerServlet.persistAllButton=全部
htmlHostManagerServlet.persistTitle=持久化配置
-htmlHostManagerServlet.serverOSArch=OS 架构
+htmlHostManagerServlet.serverJVMVendor=JVM供应商
+htmlHostManagerServlet.serverJVMVersion=JVM版本
+htmlHostManagerServlet.serverOSArch=操作系统架构
+htmlHostManagerServlet.serverOSName=操作系统名称
+htmlHostManagerServlet.serverOSVersion=操作系统版本
htmlHostManagerServlet.serverTitle=服务器信息
+htmlHostManagerServlet.serverVersion=Tomcat版本
htmlHostManagerServlet.title=Tomcat虚拟主机管理员
statusServlet.complete=服务器全部状态
diff --git a/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties b/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
index bfacd5b..2e7f2d8 100644
--- a/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mapper/LocalStrings_zh_CN.properties
@@ -16,5 +16,6 @@
mapper.addHostAlias.success=为虚拟主机 [{1}] 注册了别名 [{0}]
mapperListener.pauseContext=根据服务需要，注册内容[{0}]已经重新加载
+mapperListener.registerHost=这域名[{1}]注册主机[{0}]，服务：[{2}]
mapperListener.registerWrapper=为服务Service[{2}]在上下文Context[{1}]注册Wrapper[{0}]
mapperListener.unregisterHost=在域[{1}]中.,不能注册主机[{0}]为服务[{2}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index fc4e09a..55d6740 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -14,6 +14,7 @@
# limitations under the License.
combinedRealm.authFail=无法使用域[{1}]对用户[{0}]进行身份验证
+combinedRealm.authSuccess=认证用户[{0}]，权限[{1}]
dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。
dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常
diff --git a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
index 3b8cf09..8913ebf 100644
--- a/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings_zh_CN.properties
@@ -14,11 +14,13 @@
# limitations under the License.
cgiServlet.expandFail=在路径[{0}] 到[{1}] 展开脚本失败.
+cgiServlet.expandOk=从路径[{0}]到[{1}]扩展脚本
cgiServlet.find.location=在 [{0}] 查找文件
cgiServlet.runHeaderReaderFail=I/O 问题关闭请求头读操作
cgiServlet.runInvalidStatus=无效状态 [{0}]
cgiServlet.runOutputStreamFail=关闭输出流时发生I/O问题
cgiServlet.runReaderInterrupt=对于标准错误的读线程，中断并等待。
+cgiServlet.runStdErrFail=I/O标准错误问题
defaultServlet.blockExternalSubset=用名称[{0}]和baseURI[{1}]阻止对外部子集的访问
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index 6aa9503..1e7bf91 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+JDBCStore.checkConnectionDBReOpenFail=重新打开数据库失败，数据库可能已经宕机。
JDBCStore.missingDataSourceName=没有给出有效的 JNDI 名称。
JDBCStore.saving=保存Session [{0}] 到数据库 [{1}]
@@ -32,6 +33,8 @@ standardManager.loading.exception=加载持久化会话时发生异常
standardManager.managerLoad=从持久化存储加载会话发生异常
standardManager.managerUnload=卸载会话到持久存储的异常
+standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
+standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效
standardSession.getValueNames.ise=getValueNames：会话已经失效
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 9913bda..a0db0db 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -16,6 +16,7 @@
catalina.incorrectPermissions=权限错误，此文件没有读取权限
catalina.init=服务器在[{0}]毫秒内初始化
catalina.serverStartFail=所必需的服务组件启动失败，所以无法启动Tomcat
+catalina.usage=用法: java org.apache.catalina.startup.Catalina [ -config {pathname} ] [ -nonaming ] { -help | start | stop }
catalinaConfigurationSource.cannotObtainURL=无法获取相对路径 [{0}] 的URL。 检查catalina.base是否已设置。
@@ -31,6 +32,7 @@ contextConfig.defaultMissing=未找到全局 web.xml
contextConfig.defaultPosition=发生在 [{0}] 行 [{1}] 列
contextConfig.fixDocBase=上下文[{0}]的异常修复docBase
contextConfig.init=上下文配置: 正在初始化
+contextConfig.inputStreamFile=无法为注解处理文件[{0}]
contextConfig.inputStreamWebResource=不能处理注释的Web资源[{0}]
contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
contextConfig.processAnnotationsDir.debug=使用注解 [{0}]扫描目录中的类文件
@@ -69,10 +71,10 @@ userConfig.start=用户配置：处理开始
versionLoggerListener.catalina.home=CATALINA_HOME: {0}
versionLoggerListener.java.home=Java 环境变量: {0}
-versionLoggerListener.os.arch=结.造: {0}
+versionLoggerListener.os.arch=架构: {0}
versionLoggerListener.os.version=OS.版本: {0}
versionLoggerListener.prop=系统属性: {0} = {1}
-versionLoggerListener.serverInfo.server.built=Server.构建: {0}
+versionLoggerListener.serverInfo.server.built=服务器构建: {0}
versionLoggerListener.serverInfo.server.version=Server.服务器版本: {0}
versionLoggerListener.vm.vendor=JVM.供应商: {0}
versionLoggerListener.vm.version=JVM 版本: {0}
diff --git a/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
index 450f7b3..a9c480c 100644
--- a/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/group/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+channelCoordinator.alreadyStarted=通道已经启动，级别：[{0}]
channelCoordinator.invalid.startLevel=启动级别无效，有效级别为：SND_RX_SEQ，SND_TX_SEQ，MBR_TX_SEQ，MBR_RX_SEQ
groupChannel.listener.alreadyExist=侦听器已存在：[{0}][{1}]
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index e2c5355..611ce71 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -34,6 +34,7 @@ gzipInterceptor.report=:)GZip 拦截器报告[\n\
\tRx 未压缩的字节: {10}\n\
]
+messageDispatchInterceptor.errorMessage.failed=无法回传错误信息
messageDispatchInterceptor.queue.full=异步队列已满，达到 [{0}] 字节的限制，当前：[{1}] 字节
messageDispatchInterceptor.unableAdd.queue=无法将消息添加到异步队列，队列 bug？
messageDispatchInterceptor.warning.optionflag=警告！你正在覆盖异步选项标志，这将禁用其它程序可能用到的 Channel.SEND_OPTIONS_ASYNCHRONOUS。
@@ -47,6 +48,7 @@ staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
tcpFailureDetector.failureDetection.failed=无法进行失败监测，假定成员宕机。[{0}]
tcpFailureDetector.heartbeat.failed=TCP心跳检测器无法执行心跳
+tcpFailureDetector.member.disappeared=认证完成。成员消失[{0}]
tcpFailureDetector.still.alive=验证完成。成员 [{0}] 仍然存活
tcpPingInterceptor.ping.failed=无法发送 TCP ping
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
index c30039f..b04ff3a 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_zh_CN.properties
@@ -19,6 +19,9 @@ mcastServiceImpl.invalid.startLevel=无效的启动级别。只接受以下级
mcastServiceImpl.recovery=家族成员，运行恢复线程，广播不是功能。
mcastServiceImpl.recovery.stopFailed=恢复线程未能停止成员服务。
mcastServiceImpl.send.running=McastService.send已经运行
+mcastServiceImpl.setInterface=设置多宿主多播接口为：[{0}]
+mcastServiceImpl.setSoTimeout=设置集群多播超时时间：[{0}]
+mcastServiceImpl.setTTL=设置集群多播TTL：[{0}]
mcastServiceImpl.unable.join=无法加入多播组，请确保你的系统已启用多播。
mcastServiceImpl.unableReceive.broadcastMessage=无法接收广播消息。
diff --git a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
index fc344ac..a6dddcb 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings_zh_CN.properties
@@ -17,9 +17,12 @@ abstractStream.CACertUndefined=CA证书文件未定义
abstractStream.fileNotFound=未找到 CA 证书文件 [{0}]
abstractStream.trustManagerError=无法为{0}创建信任管理器
-cloudMembershipService.stopFail=无法停止静态成员资格服务，级别为：[{0}]
+certificateStream.clientCertError=无法为{0} {1} 创建key管理器
+
+cloudMembershipService.stopFail=无法停止云成员资格服务，级别为：[{0}]
dnsMembershipProvider.dnsError=由于命名空间[{0}]导致的多个错误主机地址
+kubernetesMembershipProvider.invalidPod=Pod丢失了一些必须的属性
kubernetesMembershipProvider.memberError=创建成员错误
kubernetesMembershipProvider.noNamespace=命名空间未设置
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
index d3dad73..6e33954 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -17,6 +17,7 @@ abstractReplicatedMap.broadcast.noReplies=广播收到0回复，可能是超时
abstractReplicatedMap.leftOver.ignored=消息[{0}]被忽略
abstractReplicatedMap.transferState.noReplies=传输状态，0响应，也许是超时。
abstractReplicatedMap.unable.get=无法复制 AbstractReplicatedMap.get 操作的数据
+abstractReplicatedMap.unableSelect.backup=无法选择备用节点
abstractReplicatedMap.unableSend.startMessage=无法发送map启动消息。
lazyReplicatedMap.unableReplicate.proxy=不能复制proxy key:[{0}]到备份:[{1}]. 原因是:[{2}]
diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
index 3a87d15..f935ce4 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings_zh_CN.properties
@@ -16,6 +16,7 @@
nioReceiver.alreadyStarted=ServerSocketChannel已经被启动
nioReceiver.cleanup.fail=无法清除关闭的选择器
nioReceiver.clientDisconnect=复制客户端已断开连接，轮询密钥时出错。忽略客户端。
+nioReceiver.requestError=NioReceiver无法处理请求
nioReceiver.run.fail=不能允许复制监听器
nioReceiver.start.fail=无法启动集群接收器
nioReceiver.stop.fail=无法关闭集群接收的选择器
@@ -25,9 +26,12 @@ nioReplicationTask.error.register.key=错误的注册key被读取了
nioReplicationTask.process.clusterMsg.failed=处理集群消息失败
nioReplicationTask.unable.ack=不能通过channel发送ack，channel已经断开?[{0}]
+nioSender.not.connected=NioSender未连接，这是不应该发生的。
nioSender.unknown.state=数据处于未知状态。readyOps = [{0}]
parallelNioSender.send.failed=并行的NIO.发送失败。
parallelNioSender.sendFailed.attempt=发送失败，尝试: [{0}] 最大: [{1}]
+parallelNioSender.sender.disconnected.sendFailed=发送失败且sender已断开连接，不再重试。
pooledParallelSender.sender.disconnected=sender 未连接。
+pooledParallelSender.unable.retrieveSender=无法从sender池中获取一个sender
diff --git a/java/org/apache/catalina/tribes/util/LocalStrings_zh_CN.properties b/java/org/apache/catalina/tribes/util/LocalStrings_zh_CN.properties
index 6a1fa8e..3e13106 100644
--- a/java/org/apache/catalina/tribes/util/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/util/LocalStrings_zh_CN.properties
@@ -14,5 +14,6 @@
# limitations under the License.
arrays.keyoffset.outOfBounds=key的偏移.超出了界限。
+arrays.length.outOfBounds=当前key下没有足够的元素，长度越界
executorFactory.not.running=执行器没有运行，无法强制把命令送入队列
diff --git a/java/org/apache/catalina/users/LocalStrings_zh_CN.properties b/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
index 1a72890..8506f72 100644
--- a/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
@@ -15,6 +15,7 @@
memoryUserDatabase.fileClose=关闭 [{0}] 失败
memoryUserDatabase.fileDelete=无法删除 [{0}]
+memoryUserDatabase.fileNotFound=指定用户数据库[{0}]未找到
memoryUserDatabase.notPersistable=用户数据库不可持久化 - 对目录没有写入权限
memoryUserDatabase.nullRole=指定的角色名为Null或着长度为0。角色将被忽略，
memoryUserDatabase.readOnly=用户数据库已被设为只读。修改无法保存
diff --git a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
index acbf500..0201a68 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_zh_CN.properties
@@ -15,6 +15,7 @@
cache.addFail=无法将位于[{0}]的资源添加到Web应用程序[{1}]的缓存中，因为在清除过期缓存条目后可用空间仍不足 - 请考虑增加缓存的最大空间。
+extractingRoot.jarFailed=解压JAR文件[{0}]失败
extractingRoot.targetFailed=无法为提取的 JAR 文件创建目录 [{0}]
fileResource.getUrlFail=不能决定一个url 为资源[{0}]
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 87091e8..9afd03b 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -29,4 +29,4 @@ iib.invalidmethod=在方法名称中发现无效的字符串, HTTP 方法名必
iib.readtimeout=从套接字读取数据超时
iob.failedwrite=写入.失败
-iob.illegalreset=response 在提交后不允许被重置
+iob.illegalreset=response一旦提交不允许被重置
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 7ad2628..3e9f78c 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -26,8 +26,10 @@ hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因
hpackdecoder.tableSizeUpdateNotAtStart=任何表大小的更新都必须在头块开始时发送。
http2Parser.error=连接到[{0}]，Stream [{1}], 框架类型 [{2}], 错误
+http2Parser.headerLimitSize=连接[{0}]，Stream[{1}]，总的头信息尺寸太大
http2Parser.headers.wrongStream=连接[{0}], 头部信息对于流[{1}]正在进行但对于流[{2}]的一帧已经收到了。
http2Parser.nonZeroPadding=连接[{0}]，流[{1}]，非零填充
+http2Parser.preface.invalid=出现无效连接
http2Parser.processFrameData.window=连接[{0}]，客户端发送的数据比流窗口允许的多
http2Parser.processFrameHeaders.decodingDataLeft=数据在HPACK解码后依然保留 - 它本应该被消费掉
http2Parser.processFramePriority.invalidPayloadSize=以[{0}]无效的有效负载大小接收的优先级帧（应该是5）
@@ -39,17 +41,20 @@ stream.inputBuffer.reset=流.重置
stream.writeTimeout=等待客户端增加流控制窗口以允许写入流数据的超时
streamProcessor.cancel=连接到[{0}]，Stream [{1}]，
+streamProcessor.error.connection=连接[{0}]，Stream[{0}]，处理中发生错误，对连接来说是致命的。
streamProcessor.service.error=请求处理期间出错
streamStateMachine.invalidReset=连接[{0}]，流[{1}]，状态[{2}]，在这种状态下不允许重置
upgradeHandler.ioerror=连接[{0}]
upgradeHandler.pingFailed=对客户端发送ping 链接失败.
+upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败
upgradeHandler.socketCloseFailed=关闭 socket 错误
upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
\n
upgradeHandler.tooMuchOverhead=连接[{0}]，开销过大，连接将关闭
upgradeHandler.upgrade=连接[{0}], HTTP/1.1 升级到流[1]
+upgradeHandler.upgradeDispatch.exit=退出，连接[{0}]， SocketState[{1}]
upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}]
upgradeHandler.writeHeaders=连接 [{0}]，流 [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 5c9d165..75472de 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -64,14 +64,18 @@ jsp.error.outputfolder=无输出目录
jsp.error.overflow=错误：JSP缓冲区溢出
jsp.error.page.conflict.errorpage=页指令：不同值的多次出现“errorPage”的非法值（旧:[{0}],新:[{1}]）
jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的值无效
+jsp.error.page.invalid.import=网页指令：无效引用
jsp.error.page.invalid.iselignored=页面指令：忽略的无效值
jsp.error.page.invalid.session=页面提示：session值无效
jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
jsp.error.page.nullThrowable=空异常
jsp.error.param.invalidUse=jsp:param 不能在jsp:include、jsp:forward或jsp:params等元素外使用
jsp.error.paramexpected=使用“name”和“value”属性期望“jsp:param”标准操作
+jsp.error.params.invalidUse=参数jsp:params必须是jsp:plugin的直接孩子参数
jsp.error.parse.xml=无法解析 XML 文件 [{0}]
jsp.error.parse.xml.invalidPublicId=无效的 PUBLIC ID: [{0}]
+jsp.error.plugin.nocode=代码未定义在jsp:plugin中
+jsp.error.plugin.notype=jsp:plugin中未声明type
jsp.error.plugin.wrongRootElement=[{0}] 中的根元素的名称与 [{1}] 的不同
jsp.error.precompilation=无法预编译JSP[{0}]
jsp.error.precompilation.parameter=不能将预编译请求参数[{0}]设置为[{1}]
diff --git a/java/org/apache/naming/factory/LocalStrings_zh_CN.properties b/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
index e98790a..814ed8d 100644
--- a/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
+++ b/java/org/apache/naming/factory/LocalStrings_zh_CN.properties
@@ -13,4 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+lookupFactory.createFailed=无法创建JNDI查找工厂类实例
+
resourceLinkFactory.nullType=引用全局资源 [{1}] 的本地资源链接 [{0}] 未指定所需的属性类型
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 94a1a52..6d0140e 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -14,3 +14,4 @@
# limitations under the License.
uDecoder.convertHexDigit.notHex=[{0}] 不是十六进制数字
+uDecoder.urlDecode.conversionError=使用编码[{1}]解码[{0}]失败
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 7bd2e38..72df1c5 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties
@@ -16,6 +16,7 @@
cookies.invalidCookieToken=Cookie：cookie无效。值不是令牌或引用值
cookies.invalidSpecial=Cookies：未知特殊的Cookie
+parameters.bytes=开始处理输入[{0}]
parameters.copyFail=无法创建以调试日志记录为目的的原始参数值的副本
parameters.decodeFail.debug=字符解码失败.参数 [{0}]和值 [{1}]被忽略
parameters.fallToDebug=注：将在DEBUG级别记录更多参数错误。
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 72bec74..d4772b0 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -16,8 +16,9 @@
channel.nio.ssl.closing=频道处于正在关闭(closing)的状态
channel.nio.ssl.foundHttp=找到一个明文HTTP请求，它应该是一个加密的TLS连接
channel.nio.ssl.invalidCloseState=无效的关闭状态，不会发送网络数据。
+channel.nio.ssl.notHandshaking=握手认证期间NOT_HANDSHAKING
channel.nio.ssl.sniDefault=无法缓冲足够的数据来确定请求的SNI主机名。使用默认值
-channel.nio.ssl.sniHostName=连接 [{0}]
+channel.nio.ssl.sniHostName=连接[{0}]中提取的SNI主机名称是[{1}]
channel.nio.ssl.timeoutDuringHandshake=握手期间超时。
channel.nio.ssl.unwrapFail=无法解包数据，无效状态 [{0}]
channel.nio.ssl.unwrapFailResize=由于缓冲区太小无法解包数据，无效状态 [{0}]
@@ -35,12 +36,14 @@ endpoint.debug.socketCloseFail=关闭 socket 失败
endpoint.debug.unlock.localNone=无法解除 [{0}] 的接受器，因为本地地址不可用
endpoint.err.close=抓住异常试图关闭socket
endpoint.err.unexpected=处理套接字时意外错误
+endpoint.getAttribute=[{0}] 是 [{1}]
endpoint.init.notavail=APR.不可用
endpoint.invalidJmxNameSslHostCert=对于SSLHostConfigCertificate关联的主机[{0}]和证书类型[{1}]，无法生成有效的XML对象名称
endpoint.nio.stopLatchAwaitInterrupted=在等待轮询器停止时，该线程被中断
endpoint.nio.timeoutCme=处理超时异常. 这段代码已经被重复检查并且没有并发修改发现。如果你能重现这个错误，请提交一个tomcat bug, 提供重现步骤.
endpoint.noSslHostConfig=没有找到带有hostName[{0}]的SSLHostConfig元素，以匹配连接器[{1}]的默认SSLHostConfigName
endpoint.noSslHostName=SSL主机中没有被提供主机名
+endpoint.poll.limitedpollsize=创建轮询器失败，大小：[{0}]
endpoint.process.fail=分配 socket 处理器出错
endpoint.processing.fail=运行.套接字处理器出错
endpoint.removeDefaultSslHostConfig=默认SSLHostConfig(名为[{0}])可能未被移除
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 19ea675..beef591 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -18,6 +18,7 @@ asyncChannelWrapperSecure.eof=意外的流结尾
caseInsensitiveKeyMap.nullKey=不允许 Key 是 Null
perMessageDeflate.deflateFailed=无法压缩这个WebSocket压缩结构
+perMessageDeflate.duplicateParameter=重复定义的扩展参数[{0}]
util.notToken=一个非法的扩展参数被指定为名称[{0}]和值[{0}]
util.unknownDecoderType=无法识别该解码器类型[{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4be027c..d6474dc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -51,6 +51,11 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
</add>
+ <add>
+ Expand the coverage and quality of the Simplified Chinese translations
+ provided with Apache Tomcat. Includes contributions by leeyazhou.
+ (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org