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 2021/09/02 20:12:19 UTC
[tomcat] branch 10.0.x updated: Backport translation fixes
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 7e88f86 Backport translation fixes
7e88f86 is described below
commit 7e88f86b513eaf63283d9945b934cb199d656eb8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 2 21:12:12 2021 +0100
Backport translation fixes
---
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 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 +
webapps/docs/changelog.xml | 10 ++++++++++
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 0d55feb..4212a3e 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 8946f62..414d491 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 8fd3f13..78e2cc7 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
@@ -97,8 +97,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\ 错误消息：{6}\n\
\ 接收消息：{7} 消息数\n\
\ 接收速率：{8} MB/秒（从第一个消息开始）\n\
-\ 收到：{9}MB]\n\
-\n
+\ 收到：{9}MB]\n
twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 04731b9..a232213 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=コネクション[{0}]、ストリーム[{1}]は
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST (ストリームを切断します)
upgradeHandler.sendPrefaceFail=コネクション [{0}]、クライアントにプリフェイスを送信できませんでした。
+upgradeHandler.sendfile.reservation=sendfileによるwriteの前の 接続[{0}]、ストリーム[{1}]、接続予約[{2}]、ストリーム予約[{3}]
upgradeHandler.socketCloseFailed=ソケットクローズ中のエラー
upgradeHandler.startRequestBodyFrame.result=接続[{0}]、ストリーム[{1}] startRequestBodyFrameが [{2}] を返しました
upgradeHandler.stream.closed=ストリーム[{0}]がしばらく閉じられていました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 742f90a..bd6d88d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로
upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을 닫습니다)
upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
+upgradeHandler.sendfile.reservation=sendfile 쓰기 직전입니다. 연결 [{0}], 스트림 [{1}], 연결 예약 [{2}], 연결 예약 [{3}]
upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]: startRequestBodyFrame()이 [{2}]을(를) 반환함.
upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f59579d..5d402c0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -231,6 +231,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org