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 ecd49b4205 Back-port missing translations
ecd49b4205 is described below
commit ecd49b4205b64511585c0b19da7584c06ac6a3c3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 19 17:02:39 2024 +0000
Back-port missing translations
---
java/org/apache/catalina/servlets/LocalStrings.properties | 5 ++---
java/org/apache/coyote/http2/LocalStrings.properties | 6 ++++++
java/org/apache/coyote/http2/LocalStrings_fr.properties | 6 ++++++
java/org/apache/coyote/http2/LocalStrings_ja.properties | 6 ++++++
java/org/apache/coyote/http2/LocalStrings_ko.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 1 +
6 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/LocalStrings.properties
b/java/org/apache/catalina/servlets/LocalStrings.properties
index f60c50a7e1..b869d0819d 100644
--- a/java/org/apache/catalina/servlets/LocalStrings.properties
+++ b/java/org/apache/catalina/servlets/LocalStrings.properties
@@ -55,6 +55,8 @@ defaultServlet.skipfail=Read failed because only [{0}] bytes
were available but
defaultServlet.unknownBomConfig=Unrecognised value of [{0}] provided for
useBomIfPresent initialization parameter
defaultServlet.xslError=XSL transformer error
+webdavservlet.dataSourceStore.error=Error processing [{0}] on dead properties
for path [{1}]
+webdavservlet.dataSourceStore.noDataSource=DataSource [{0}] was not found in
the webapp environment
webdavservlet.externalEntityIgnored=The request included a reference to an
external entity with PublicID [{0}] and SystemID [{1}] which was ignored
webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
webdavservlet.jaxpfailed=JAXP initialization failed
@@ -62,6 +64,3 @@ webdavservlet.memorystore=Non persistent memory storage will
be used for dead pr
webdavservlet.noStoreParameter=Init parameter [{0}] with value [{1}] was not
found on the configured store
webdavservlet.nonWildcardMapping=The mapping [{0}] is not a wildcard mapping
and should not be used for the WebDAV Servlet
webdavservlet.storeError=Error creating store of class [{0}], the default
memory store will be used instead
-
-webdavservlet.dataSourceStore.error=Error processing [{0}] on dead properties
for path [{1}]
-webdavservlet.dataSourceStore.noDataSource=DataSource [{0}] was not found in
the webapp environment
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 6ab82e8bdb..b685f4d712 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -88,6 +88,7 @@ http2Protocol.jmxRegistration.fail=JMX registration for the
HTTP/2 protocol fail
pingManager.roundTripTime=Connection [{0}] Round trip time measured as [{1}]ns
+stream.clientResetRequest=Client reset the stream before the request was fully
read
stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once
it has been closed
stream.header.case=Connection [{0}], Stream [{1}], HTTP header name [{2}] must
be in lower case
stream.header.connection=Connection [{0}], Stream [{1}], HTTP header [{2}] is
not permitted in an HTTP/2 request
@@ -111,6 +112,8 @@ stream.inputBuffer.signal=Data added to inBuffer when read
thread is waiting. Si
stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into
input stream buffer
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Duplicate request to
recycle the associated request and response has been ignored
+stream.recycle.first=Connection [{0}], Stream [{1}] The associated request and
response have been recycled
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
@@ -130,6 +133,7 @@ streamStateMachine.invalidReset=Connection [{0}], Stream
[{1}], Stream may not b
upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}]
bytes
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes
unallocated - trying to allocate to children
+upgradeHandler.clientCancel=Client reset the stream before the response was
complete
upgradeHandler.connectionError=Connection error
upgradeHandler.enableRfc7450Priorities=Connection [{0}], RFC 7450 priorities
may not be enabled after being disabled in the initial connection settings
frame (see RFC 9218)
upgradeHandler.fallToDebug=\n\
@@ -148,6 +152,8 @@ upgradeHandler.pruneIncomplete=Connection [{0}], Stream
[{1}], Failed to fully p
upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] duplicate
attempt to replace stream with lightweight implementation has been ignored
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] replaced with
lightweight stream implementation
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset received
due to [{2}]
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], Message
[{3}], RST (closing stream)
upgradeHandler.sendPrefaceFail=Connection [{0}], Failed to send preface to
client
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 2d1967d551..554ca51153 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -88,6 +88,7 @@ http2Protocol.jmxRegistration.fail=L'enregistrement dans JMX
du protocole HTTP/2
pingManager.roundTripTime=Connection [{0}] Le temps d''aller retour est de
[{1}]ns
+stream.clientResetRequest=Le client a réinitialisé la stream avant qu'elle ait
été complètement lue
stream.closed=Connection [{0}], Flux [{1}], Impossible d''écrire sur un flux
après sa fermeture
stream.header.case=Connection [{0}], Flux [{1}], Le nom d''en-tête HTTP [{2}]
doit être en miniscules
stream.header.connection=Connection [{0}], Flux [{1}], L''en-tête HTTP [{2}]
n''est pas autorisé dans une requête HTTP/2
@@ -111,6 +112,8 @@ stream.inputBuffer.signal=Des données ont été ajoutées dans
inBuffer alors q
stream.inputBuffer.swallowUnread=[{0}] bytes qui ont été auparavant lu dans le
tampon d''entrée ont été avalés
stream.notWritable=Connection [{0}], Flux [{1}], Impossible d''écrire sur ce
flux
stream.outputBuffer.flush.debug=Connection [{0}], Flux [{1}], envoi des
données mises en tampon depuis la position [{2}], writeInProgress [{3}] et
closed [{4}]
+stream.recycle.duplicate=Connection [{0}], Stream [{1}] Une tentative de
double recyclage de la requête et de la réponse associées a été ignorée
+stream.recycle.first=Connection [{0}], Stream [{1}] La requête et la réponse
associées ont été recyclées
stream.reset.fail=Connection [{0}], Flux [{1}], Echec de réinitialisation du
flux
stream.reset.receive=Connection [{0}], Flux [{1}], Réinitialisation reçue à
cause de [{2}]
stream.reset.send=Connection [{0}], Flux [{1}], Réinitialisation envoyée à
cause de [{2}]
@@ -130,6 +133,7 @@ streamStateMachine.invalidReset=Connection [{0}], Stream
[{1}], la Stream ne doi
upgradeHandler.allocate.debug=Connection [{0}], Flux [{1}], [{2}] octets
alloués
upgradeHandler.allocate.left=Connection [{0}], Flux [{1}], [{2}] octets
désalloués, essai d''allocation aux enfants
+upgradeHandler.clientCancel=Le client a réinitialisé la stream avant que la
réponse ne soit complète
upgradeHandler.connectionError=Erreur de la connection
upgradeHandler.enableRfc7450Priorities=Connection [{0}], les priorités RFC
7450 ne doivent pas être activées après avoir été désactivées dans la trame
initiale des paramètres de connection (voir la RFC 9218)
upgradeHandler.fallToDebug=\n\
@@ -148,6 +152,8 @@ upgradeHandler.pruneIncomplete=Connexion [{0}], Flux [{1}],
Erreur lors de l''é
upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens
flux, la limite est de [{1}] et il y a actuellement [{2}] flux
upgradeHandler.pruned=Connection [{0}] Elimination du flux terminé [{1}]
upgradeHandler.releaseBacklog=Connection [{0}], Flux [{1}] enlevée de la file
d''attente
+upgradeHandler.replace.duplicate=Connection [{0}], Stream [{1}] Une tentative
de double remplacement de la stream par son implémentation légère a été ignorée
+upgradeHandler.replace.first=Connection [{0}], Stream [{1}] Remplacement par
l''implémentation légère de stream
upgradeHandler.reset.receive=Connection [{0}], Stream [{1}], Reset a été reçu
à cause de [{2}]
upgradeHandler.rst.debug=Connexion [{0}], Flux [{1}], Erreur [{2}], Message
[{3}], RST (fermeture du flux)
upgradeHandler.sendPrefaceFail=Connexion [{0}], échec d''envoi de la préface
au client
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 44c49a45b6..19b743fd7b 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -88,6 +88,7 @@ http2Protocol.jmxRegistration.fail=HTTP/2プロトコルのJMX登録に失敗し
pingManager.roundTripTime=コネクション [{0}] の往復時間は [{1}] ns でした。
+stream.clientResetRequest=リクエストが完全に読み取られる前にクライアントがストリームをリセットしました
stream.closed=コネクション [{0}]、ストリーム [{1}]、切断したストリームには書き込みできません
stream.header.case=コネクション [{0}]、ストリーム [{1}]、HTTP ヘッダー名 [{2}] は小文字でなければなりません。
stream.header.connection=コネクション [{0}]、ストリーム [{1}]、HTTP/2 のリクエストには HTTP ヘッダー
[{2}] を指定することはできません。
@@ -111,6 +112,8 @@ stream.inputBuffer.signal=読み込みスレッドが待機している間に in
stream.inputBuffer.swallowUnread=以前に入力ストリームバッファに読み込まれた [{0}] バイトを飲み込ます
stream.notWritable=コネクション [{0}]、ストリーム [{1}]、このストリームには書き込みできません。
stream.outputBuffer.flush.debug=コネクション [{0}]、ストリーム [{1}]、バッファポジション
[{2}]で出力をフラッシュ、writeInProgress [{3}]、クローズ [{4}]
+stream.recycle.duplicate=Connection [{0}]、Stream [{1}]
関連するリクエストとレスポンスをリサイクルするための重複したリクエストは無視されました
+stream.recycle.first=Connection [{0}]、Stream [{1}] 関連するリクエストとレスポンスがリサイクルされました
stream.reset.fail=コネクション [{0}]、ストリーム [{1}]、ストリームをリセットできません。
stream.reset.receive=コネクション [{0}]、ストリーム [{1}]、[{2}] のために受信されたリセット
stream.reset.send=コネクション [{0}]、ストリーム [{1}]、[{2}] が原因で RESET を送信しました。
@@ -130,6 +133,7 @@ streamStateMachine.invalidReset=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.allocate.debug=コネクション [{0}]、ストリーム [{1}]、割り当てられた [{2}] バイト
upgradeHandler.allocate.left=コネクション [{0}]、ストリーム [{1}]、[{2}] バイトが未割り当て -
子への割り当てを試みています
+upgradeHandler.clientCancel=レスポンスが完了する前にクライアントがストリームをリセットしました
upgradeHandler.connectionError=接続エラー
upgradeHandler.enableRfc7450Priorities=接続 [{0}] は、RFC 7450
優先順位が初期接続設定フレームで無効にされた後に有効にならない場合があります (RFC 9218 を参照)
upgradeHandler.fallToDebug=\n\
@@ -148,6 +152,8 @@ upgradeHandler.pruneIncomplete=コネクション [{0}]、ストリーム [{1}]
upgradeHandler.pruneStart=コネクション [{0}] 古いストリームのプルーニングを開始します。 上限は [{1}] で、現在
[{2}] ストリームがあります。
upgradeHandler.pruned=コネクション [{0}]、完了したストリーム [{1}] は削除します。
upgradeHandler.releaseBacklog=コネクション [{0}]、ストリーム [{1}] はバックログから解放されました
+upgradeHandler.replace.duplicate=Connection [{0}]、Stream [{1}]
のストリームを軽量実装に置き換える重複した試みは無視されました
+upgradeHandler.replace.first=Connection [{0}]、Stream [{1}] が軽量ストリーム実装に置き換えられました
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST
(ストリームを切断します)
upgradeHandler.sendPrefaceFail=コネクション [{0}]、クライアントにプリフェイスを送信できませんでした。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 5249e258b4..e67000fb7f 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -125,6 +125,7 @@ streamStateMachine.invalidFrame=연결 [{0}], 스트림 [{1}], 상태
[{2}], 프
upgradeHandler.allocate.debug=연결 [{0}], 스트림 [{1}], [{2}] 바이트를 할당함.
upgradeHandler.allocate.left=연결 [{0}], 스트림 [{1}], [{2}] 바이트들이 할당 해제되었습니다 -
자식들에 할당하려 시도합니다.
+upgradeHandler.clientCancel=응답이 완료되기 전에 클라이언트가 스트림을 리셋했습니다.
upgradeHandler.connectionError=연결 오류
upgradeHandler.fallToDebug=\n\
\ 주의: 추가로 발생하는 HTTP/2 스트림 오류들은 디버그 수준의 로그로 기록될 것입니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 6706bcd295..d51332df20 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -125,6 +125,7 @@ streamStateMachine.invalidFrame=连接[{0}]、流[{1}]、状态[{2}]、帧类型
upgradeHandler.allocate.debug=连接[{0}]，流[{1}]，已分配[{2}]字节
upgradeHandler.allocate.left=连接[{0}]，流[{1}]，[{2}]字节未分配 - 尝试分配给子项
+upgradeHandler.clientCancel=客户端在响应完成前重置了数据流
upgradeHandler.connectionError=连接错误
upgradeHandler.fallToDebug=注意：往后出现 HTTP/2 流的错误将以 DEBUG 日志级别输出。
upgradeHandler.goaway.debug=连接[{0}]，离开，最后的流[{1}]，错误码[{2}]，调试数据[{3}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
