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 174f5af Back-port translation updates
174f5af is described below
commit 174f5afcb65b97f32c5fea11e09ef85de24c6f8e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 2 21:16:30 2021 +0100
Back-port translation updates
---
java/org/apache/catalina/realm/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_ko.properties | 1 +
.../tribes/group/interceptors/LocalStrings_zh_CN.properties | 3 +--
webapps/docs/changelog.xml | 10 ++++++++++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index fc317b9..a041039 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.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/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index b73d92e..89c8f9a 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=사용자가 제공한
credentials과
dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
dataSourceRealm.close=데이터베이스 연결을 닫는 중 예외 발생
+dataSourceRealm.commit=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
dataSourceRealm.exception=인증 처리 수행 중 예외 발생
dataSourceRealm.getPassword.exception=[{0}]을(를) 위한 비밀번호를 조회하던 중 예외 발생
dataSourceRealm.getRoles.exception=사용자 [{0}]을(를) 위한 역할들을 조회하는 중 예외 발생
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 bd4117d..421d17f 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
@@ -76,8 +76,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\ 错误消息：{6}\n\
\ 接收消息：{7} 消息数\n\
\ 接收速率：{8} MB/秒（从第一个消息开始）\n\
-\ 收到：{9}MB]\n\
-\n
+\ 收到：{9}MB]\n
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
twoPhaseCommitInterceptor.originalMessage.missing=收到确认，但原始邮件丢失。Id:[{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a9a6ab4..5cff909 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,16 @@
Switch to the CDN as the primary download location for ASF
dependencies.
(markt)
</update>
+ <add>
+ Improvements to Chinese translations contributed by syseal, wolibo and
+ ZhangJieWen. (markt)
+ </add>
+ <add>
+ Improvements to Japanese translations contributed by tak7iji. (markt)
+ </add>
+ <add>
+ Improvements to Korean translations. (woonsan)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
