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/12/06 10:16:47 UTC
[tomcat] branch 8.5.x updated (982629d -> 69e2f4a)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 982629d Review PR #227. Add changelog entry
new 1f4d351 Back-port German translations from 9.0.x
new 50bb8c3 Back-port French tranlations from 9.0.x
new 8fa1cb0 Back-port Japanese translations from 9.0.x
new 63d35a1 Backport Korean translations from 9.0.x
new 69e2f4a Back-port updates to Chinese translations from 9.0.x
The 5 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:
.../apache/catalina/core/LocalStrings_fr.properties | 4 ++++
.../apache/catalina/core/LocalStrings_ko.properties | 4 ++++
.../catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../catalina/session/LocalStrings_zh_CN.properties | 1 +
.../catalina/startup/LocalStrings_zh_CN.properties | 1 +
.../tribes/tipis/LocalStrings_zh_CN.properties | 1 +
.../catalina/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/LocalStrings_de.properties | 1 +
java/org/apache/coyote/LocalStrings_fr.properties | 5 +++++
java/org/apache/coyote/LocalStrings_ko.properties | 5 +++++
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++
.../apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 1 +
.../coyote/http2/LocalStrings_zh_CN.properties | 5 +++++
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/buf/LocalStrings_fr.properties | 2 ++
.../tomcat/util/buf/LocalStrings_ja.properties | 2 ++
.../tomcat/util/buf/LocalStrings_ko.properties | 2 ++
.../util/http/parser/LocalStrings_zh_CN.properties | 1 +
.../tomcat/util/net/LocalStrings_fr.properties | 2 ++
.../tomcat/util/net/LocalStrings_ko.properties | 2 ++
.../websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 20 ++++++++++++++++++++
24 files changed, 68 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Backport Korean translations from 9.0.x
Posted by ma...@apache.org.
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
commit 63d35a15098d66a9840c6c82249843f1320b2547
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:14:31 2019 +0000
Backport Korean translations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 4 ++++
java/org/apache/coyote/LocalStrings_ko.properties | 5 +++++
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
5 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties b/java/org/apache/catalina/core/LocalStrings_ko.properties
index c53a8b2..0012e83 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=예기치 않은 AprLifecycleListener의 FIPSMode 옵
asyncContextImpl.asyncDispachError=비동기 디스패치 도중 오류 발생
asyncContextImpl.asyncRunnableError=AsyncContext.start()를 통해, 비동기로 Runnable을 처리하는 도중 오류 발생
asyncContextImpl.dispatchingStarted=비동기 디스패치 오퍼레이션이 이미 호출되었습니다. 동일한 비동기 사이클 내에서, 추가적인 비동기 디스패치 오퍼레이션은 허용되지 않습니다.
+asyncContextImpl.fireOnComplete=등록된 AsyncListener들에 onComplete() 이벤트를 호출합니다.
+asyncContextImpl.fireOnError=등록된 AsyncListener들에 onError() 이벤트를 호출합니다.
+asyncContextImpl.fireOnStartAsync=등록된 AsyncListener들에 onStartAsync() 이벤트를 호출합니다.
+asyncContextImpl.fireOnTimeout=등록된 AsyncListener들에 onTimeout() 이벤트를 호출합니다.
asyncContextImpl.noAsyncDispatcher=ServletContext로부터 반환된 디스패처는 비동기 디스패치를 지원하지 않습니다.
asyncContextImpl.onCompleteError=타입 [{0}]의 리스너를 위한 onComplete() 호출이 실패했습니다.
asyncContextImpl.onErrorError=타입 [{0}]의 리스너를 위한 onError() 호출이 실패했습니다.
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties b/java/org/apache/coyote/LocalStrings_ko.properties
index de89a19..99539dd 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=소켓 [{1}]을(를) 위한 프로세
abstractConnectionHandler.error=요청을 읽는 중 오류 발생. 무시합니다.
abstractConnectionHandler.ioexception.debug=IOException들은 정상적이므로, 무시합니다.
abstractConnectionHandler.negotiatedProcessor.fail=Negotiate된 프로토콜 [{0}]을(를) 위한 프로세서를 생성하지 못했습니다.
+abstractConnectionHandler.oome=요청 처리를 완료하지 못했습니다.
abstractConnectionHandler.process=상태가 [{1}]인 소켓 [{0}]을(를) 처리합니다.
abstractConnectionHandler.processorPop=캐시로부터 프로세서 [{0}]을(를) 추출했습니다.
abstractConnectionHandler.protocolexception.debug=ProtocolException들은 정상적이므로, 무시합니다.
@@ -31,6 +32,8 @@ abstractProcessor.pushrequest.notsupported=이 프로토콜은 서버 push 요
abstractProcessor.socket.ssl=SSL 속성들을 얻으려는 중 예외 발생
abstractProtocol.mbeanDeregistrationFailed=MBean 서버 [{1}](으)로부터, [{0}](이)라는 이름의 MBean의 등록을 제거하지 못했습니다.
+abstractProtocol.processorRegisterError=RequestProcessor 구성요소를 등록하는 중 오류 발생
+abstractProtocol.processorUnregisterError=RequestProcessor 구성요소를 등록 해제하는 중 오류 발생
abstractProtocolHandler.destroy=프로토콜 핸들러 [{0}]을(를) 소멸시킵니다.
abstractProtocolHandler.init=프로토콜 핸들러 [{0}]을(를) 초기화합니다.
@@ -42,6 +45,8 @@ abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵
asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 유효하지 않습니다.
+compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, Content-Encoding 헤더를 파싱하지 못했습니다.
+
request.notAsync=오직 비동기 처리 또는 HTTP 업그레이드 처리 시에만, Non-blocking IO로의 전환이 유효합니다.
request.nullReadListener=setReadListener()에 전달된 리스너는 널일 수 없습니다.
request.readListenerSet=Non-blocking 읽기 리스너가 이미 설정되어 있습니다.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index 08e5b3a..ff5a002 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -23,5 +23,7 @@ byteBufferUtils.cleaner=직접적인 ByteBuffer cleaner를 사용할 수 없습
hexUtils.fromHex.nonHex=입력은 오직 16진수 숫자로만 이루어져야 합니다.
hexUtils.fromHex.oddDigits=입력은 반드시 짝수 개의 16진수 숫자들로 이루어져야 합니다.
+uDecoder.eof=파일의 끝 (EOF)
+uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.
uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
uDecoder.urlDecode.missingDigit=% 문자 뒤에 두 개의 16진수 숫자들이 이어져야 하기 때문에, [{0}]을(를) 디코드하지 못했습니다.
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 22a3fcc..6771997 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -67,6 +67,8 @@ endpoint.debug.pollerAddDo=Poller에 소켓 [{0}]을(를) 추가합니다.
endpoint.debug.pollerProcess=다음 이벤트(들)을 위해 소켓 [{0}]을(를) 처리합니다: [{1}]
endpoint.debug.pollerRemove=Poller로부터 [{0}]을(를) 제거하려 시도 중
endpoint.debug.pollerRemoved=Poller로부터 [{0}]을(를) 제거했습니다.
+endpoint.debug.registerRead=[{0}]을(를) 위한 readInterest를 등록했습니다.
+endpoint.debug.registerWrite=[{0}]을(를) 위한 writeInterest를 등록했습니다.
endpoint.debug.socket=소켓 [{0}]
endpoint.debug.socketCloseFail=소켓을 닫지 못했습니다.
endpoint.debug.socketTimeout=제한 시간 초과로 처리합니다: [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ed4d20d..af4c3e1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,10 @@
Expand the coverage of the Japanese translations provided with Apache
Tomcat. (markt)
</add>
+ <add>
+ Expand the coverage of the Korean translations provided with Apache
+ Tomcat. (woonsan)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Back-port French tranlations from 9.0.x
Posted by ma...@apache.org.
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
commit 50bb8c30e38bd23cc9e7da8474da555d0a449d2c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:11:37 2019 +0000
Back-port French tranlations from 9.0.x
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 4 ++++
java/org/apache/coyote/LocalStrings_fr.properties | 5 +++++
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
5 files changed, 17 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 835a849..2cd9981 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -94,6 +94,10 @@ aprListener.wrongFIPSMode=Valuer inattendue de l''option FIPSMode de AprLifecycl
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.fireOnComplete=Déclenchement de l'évènement onComplete() sur tous les AsyncListeners
+asyncContextImpl.fireOnError=Déclenchement de l'évènement onError() sur tous les AsyncListeners
+asyncContextImpl.fireOnStartAsync=Déclenchement de l'évènement onStartAsync() sur tous les AsyncListeners
+asyncContextImpl.fireOnTimeout=Déclenchement de l'évènement onTimeout() sur tous les AsyncListeners
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}]
asyncContextImpl.onErrorError=L''appel à onError() a échoué pour l''écouteur de type [{0}]
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties b/java/org/apache/coyote/LocalStrings_fr.properties
index 1abd38e..49e8c1b 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=Trouvé le processeur [{0}] pour le soc
abstractConnectionHandler.error=Erreur de lecture de la requête, ignorée
abstractConnectionHandler.ioexception.debug=Les IOException sont normales et sont ignorées
abstractConnectionHandler.negotiatedProcessor.fail=Impossible de créer un processeur pour le protocole négocié [{0}]
+abstractConnectionHandler.oome=Echec de la fin de traitement d'une requête
abstractConnectionHandler.process=Traitement du socket [{0}] avec le statut [{1}]
abstractConnectionHandler.processorPop=Retrait du processeur [{0}] du cache
abstractConnectionHandler.protocolexception.debug=Les ProtocolExceptions sont normales et sont ignorées
@@ -30,6 +31,8 @@ abstractProcessor.pushrequest.notsupported=Le requêtes push du serveur ne sont
abstractProcessor.socket.ssl=Exception lors de l'obtention des attributs SSL
abstractProtocol.mbeanDeregistrationFailed=Erreur lors du désenregistrement du mbean [{0}] dans le serveur [{1}]
+abstractProtocol.processorRegisterError=Erreur lors de l'enregistrement du processeur de requêtes
+abstractProtocol.processorUnregisterError=Erreur lors du désenregistrement du processeur de requêtes
abstractProtocolHandler.destroy=Destruction du gestionnaire de protocole [{0}]
abstractProtocolHandler.init=Initialisation du gestionnaire de protocole [{0}]
@@ -41,6 +44,8 @@ abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour une requête dans l''état Async [{1}]
+compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête Content-Encoding en vérifiant si la compression était déjà utilisée
+
request.notAsync=Il n'est possible de passer en mode d'entrée-sorties non bloquantes que lors de traitements asynchrones ou après mise à niveau depuis HTTP
request.nullReadListener=L'écouteur passé à setReadListener() ne peut pas être null
request.readListenerSet=L'écouteur des lectures non bloquantes a déjà été défini
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 10dbae1..f23cd3d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -23,5 +23,7 @@ byteBufferUtils.cleaner=Impossible d'utiliser le nettoyeur de ByteBuffers direct
hexUtils.fromHex.nonHex=L'entrée doit être uniquement des chiffres héxadécimaux
hexUtils.fromHex.oddDigits=L'entrée doit contenir un nombre pair de chiffres héxadécimaux
+uDecoder.eof=Fin de fichier (EOF)
+uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé
uDecoder.urlDecode.conversionError=Echec de décodage [{0}] en utilisant le jeu de caractères [{1}]
uDecoder.urlDecode.missingDigit=Impossible de décoder [{0}] parce que le caractère % doit être suivi de deux chiffres héxadécimaux
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 2389028..e5c78b5 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -67,6 +67,8 @@ endpoint.debug.pollerAddDo=Ajout du socket [{0}] au poller
endpoint.debug.pollerProcess=Traitement de(s) évènement(s) [{1}] pour la socket [{0}]
endpoint.debug.pollerRemove=Essai d''enlever [{0}] du poller
endpoint.debug.pollerRemoved=Enlevé [{0}] du poller
+endpoint.debug.registerRead=Enregistrement de l’intérêt en lecture pour [{0}]
+endpoint.debug.registerWrite=Enregistrement de l’intérêt en écriture pour [{0}]
endpoint.debug.socket=socket [{0}]
endpoint.debug.socketCloseFail=Echec de fermeture du socket
endpoint.debug.socketTimeout=Expiration [{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 989ccc7..7eff9ad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -181,6 +181,10 @@
Expand the coverage of the German translations provided with Apache
Tomcat. Contribution provided by Jens. (markt)
</add>
+ <add>
+ Expand the coverage of the French translations provided with Apache
+ Tomcat. (remm)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Back-port Japanese translations from 9.0.x
Posted by ma...@apache.org.
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
commit 8fa1cb0a56c98eddfaa04e8dd6e39c5c72267bd6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:13:48 2019 +0000
Back-port Japanese translations from 9.0.x
---
java/org/apache/tomcat/util/buf/LocalStrings_ja.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
index a78e204..2c30d38 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -20,5 +20,7 @@ byteBufferUtils.cleaner=直接ByteBufferクリーナーを使用することは
hexUtils.fromHex.nonHex=入力は16進数でなければなりません
hexUtils.fromHex.oddDigits=入力は、偶数の16進数で構成する必要があります。
+uDecoder.eof=予期せぬ場所で終端に達しました。
+uDecoder.noSlash="/" を符号化して含めることはできません。
uDecoder.urlDecode.conversionError=文字セット[{1}]を使用して[{0}]のデコードに失敗しました
uDecoder.urlDecode.missingDigit=％文字の後ろに2つの16進数字が続く必要があるため、[{0}]のデコードに失敗しました。
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7eff9ad..ed4d20d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,10 @@
Expand the coverage of the French translations provided with Apache
Tomcat. (remm)
</add>
+ <add>
+ Expand the coverage of the Japanese translations provided with Apache
+ Tomcat. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Back-port updates to Chinese translations from 9.0.x
Posted by ma...@apache.org.
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
commit 69e2f4a95e2020c30ac460852ba2a55517c1f889
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:15:58 2019 +0000
Back-port updates to Chinese translations from 9.0.x
---
java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/session/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/LocalStrings_zh_CN.properties | 3 +++
java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 5 +++++
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties | 1 +
java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4 ++++
14 files changed, 23 insertions(+)
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 f65f96a..c3e7dd8 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings_zh_CN.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+farmWarDeployer.deleteFail=无法删除 [{0}]
farmWarDeployer.hostOnly=FarmWarDeployer 只有做为 host cluster 的子元素是才生效
farmWarDeployer.mbeanNameFail=无法为引擎[{0}]和主机[{1}]构造MBean对象名
farmWarDeployer.modInstall=从 [{1}] 安装 webapp [{0}]
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 2a38fa7..82d513d 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -21,6 +21,7 @@ dataSourceRealm.getRoles.exception=:)检索角色[{0}]异常
jaasCallback.username=返回用户名 [{0}]
+jaasRealm.authenticateFailure=用户 [{0}] 认证失败
jaasRealm.authenticateSuccess=用户名 [{0}] 已被成功认证为身份 [{1}] -- 主体也已创建
jaasRealm.failedLogin=由于登录失败，用户名 [{0}] 无法授权
jaasRealm.loginContextCreated=为用户名创建的JAAS 登陆上下文[{0}]
diff --git a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
index fc55f23..050bdef 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -43,6 +43,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常
standardManager.unloading.nosessions=没有要卸载的持久会话
standardSession.attributeEvent=会话属性事件侦听器引发异常
+standardSession.getAttribute.ise=getAttribute: 会话已失效
standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getIdleTime.ise=getIdleTime: 已失效的会话
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 248d4d2..5371ad2 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -79,6 +79,7 @@ hostConfig.deployDescriptor.error=部署描述符[{0}]时出错
hostConfig.deployDescriptor.finished=部署描述符[{0}]的部署已在[{1}]ms内完成
hostConfig.deployDescriptor.localDocBaseSpecified=(:在主机appBase 中指定了docBase [{0}]，将被忽略
hostConfig.deployDir=把web 应用程序部署到目录 [{0}]
+hostConfig.deployDir.error=无法部署应用目录 [{0}]
hostConfig.deployWar.error=部署 Web 应用程序 archive [{0}] 时出错
hostConfig.deployWar.hiddenDir=将忽略目录[{0}]，因为WAR [{1}]优先，unpackWAR为false
hostConfig.deployWar.threaded.error=等待WAR文件的多线程部署完成时出错
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 4bf1c9a..df980b2 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings_zh_CN.properties
@@ -18,6 +18,7 @@ abstractReplicatedMap.leftOver.ignored=消息[{0}]被忽略
abstractReplicatedMap.member.disappeared=成员[{0}]已消失。相关的映射项将重新定位到新节点。
abstractReplicatedMap.transferState.noReplies=传输状态，0响应，也许是超时。
abstractReplicatedMap.unable.get=无法复制 AbstractReplicatedMap.get 操作的数据
+abstractReplicatedMap.unable.put=无法复制AbstractReplicatedMap.Put操作的数据
abstractReplicatedMap.unable.relocate=无法将[{0}]重新定位到新的备份节点
abstractReplicatedMap.unableSelect.backup=无法选择备用节点
abstractReplicatedMap.unableSend.startMessage=无法发送map启动消息。
diff --git a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index a5aa356..0e919c0 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -84,6 +84,7 @@ http.511.desc=客户端需要进行身份验证才能获得网络访问权限。
remoteCidrValve.noRemoteIp=客户端没有IP地址。请求被拒绝。
+remoteIpValve.invalidHostHeader=在HTTP请求头[{1}]中发现Host的无效值[{0}]
remoteIpValve.invalidPortHeader=HTTP标头[{1}]中的端口找到的值[{0}]无效
requestFilterValve.configInvalid=为Remote [Addr | Host]阀门提供了一个或多个无效配置设置，阻止Valve及其父容器启动
diff --git a/java/org/apache/coyote/LocalStrings_zh_CN.properties b/java/org/apache/coyote/LocalStrings_zh_CN.properties
index 06c4902..61984df 100644
--- a/java/org/apache/coyote/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/LocalStrings_zh_CN.properties
@@ -23,6 +23,9 @@ abstractProcessor.hostInvalid=[{0}] 是无效主机
abstractProcessor.httpupgrade.notsupported=此协议不支持HTTP升级（upgrade）。
abstractProcessor.socket.ssl=获取SSL属性异常
+abstractProtocol.processorRegisterError=注册请求处理器错误
+abstractProtocol.processorUnregisterError=注销请求处理器错误
+
abstractProtocolHandler.destroy=正在摧毁协议处理器 [{0}]
abstractProtocolHandler.init=初始化协议处理器 [{0}]
abstractProtocolHandler.start=开始协议处理句柄[{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
index b15b9fb..534b430 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_zh_CN.properties
@@ -18,5 +18,6 @@ ajpmessage.overflow=在缓冲区[{1}]位置添加[{0}]字节时发生溢出错
ajpprocessor.certs.fail=):证书转换失败
ajpprocessor.header.error=头部信息解析失败
+ajpprocessor.readtimeout=从Socket读取数据超时
ajpprotocol.noUpgrade=AJP 不支持升级。[{0}] 的升级协议配置被忽略。
diff --git a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 53cc01f..ef42f82 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -19,6 +19,7 @@ http11processor.header.parse=解析 HTTP 请求 header 错误
http11processor.request.inconsistentHosts=请求行中指定的主机与主机头不一致。
http11processor.request.invalidScheme=HTTP请求包含具有无效方案的绝对URL
http11processor.request.invalidUserInfo=HTTP 请求包含带有无效 userinfo 的绝对 URI
+http11processor.request.multipleContentLength=请求包含了多个content-length请求头参数
http11processor.request.noHostHeader=http/1.1请求没有提供主机头
http11processor.request.prepare=准备请求时出错
http11processor.request.process=错误的处理请求
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index b2a7ff1..bce8cbb 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -50,6 +50,7 @@ http2Parser.swallow.debug=连接：[{0}]，流：[{1}]，吞下[{2}]字节
stream.closed=连接[{0}]，流[{1}]，一旦关闭就无法写入流
stream.header.debug=连接[{0}]，流[{1}]，HTTP标头[{2}]，值[{3}]
stream.header.noPath=连接[{0}]，流[{1}]，[：path]伪标头为空
+stream.header.required=连接 [{0}], 流 [{1}], 缺少一个或多个必要的头文件
stream.header.unknownPseudoHeader=收到连接[{0}]，流[{1}]，未知伪标头[{2}]
stream.inputBuffer.readTimeout=等待从客户端读取数据超时
stream.inputBuffer.reset=流.重置
@@ -76,6 +77,7 @@ upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未
upgradeHandler.rst.debug=连接[{0}]，流[{1}]，错误[{2}]，消息[{3}]，RST（关闭流）
upgradeHandler.sendPrefaceFail=连接[{0}]，给客户端发送前言失败
upgradeHandler.socketCloseFailed=关闭 socket 错误
+upgradeHandler.stream.closed=流[{0}]已经关闭了一段时间
upgradeHandler.stream.even=\ 请求了新的远程流ID[{0}]，但所有远程流都必须使用奇数标识符\n\
\n
upgradeHandler.tooMuchOverhead=连接[{0}]，开销过大，连接将关闭
@@ -87,4 +89,7 @@ upgradeHandler.windowSizeTooBig=连接[{0}]，流[{1}]，窗口太大
upgradeHandler.writeBody=连接 [{0}],数据流[{1}], 数据长度[{2}]
upgradeHandler.writeHeaders=连接 [{0}]，流 [{1}]
+windowAllocationManager.notify=连接[{0}], 流[{1}], 等待类型[{2}], 通知类型[{3}]
+windowAllocationManager.waitFor.ise=连接[{0}], 流[{1}], 已经准备好
+
writeStateMachine.ise=处于 [{1}] 状态时调用 [{0}()] 方法是非法的
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 47272c1..3bda5b6 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -146,6 +146,7 @@ jsp.warning.dumpSmap=警告：初始化堆内存的值无效。将使用“false
jsp.warning.enablePooling=警告：initParam enablePooling的值无效。将使用默认值“true”
jsp.warning.fork=警告：initParam的值无效。将使用“true”的默认值
jsp.warning.noJarScanner=警告：ServletContext中没有设置org.apache.tomcat.JarScaner。回到默认的JarScaner实现。
+jsp.warning.suppressSmap=警告:suppressSmap的初始化参数无效。将使用默认值“false”
jspc.delete.fail=无法删除文件 [{0}]
jspc.error.fileDoesNotExist=文件参数 [{0}] 不存在
diff --git a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
index 9cbb9c2..504b435 100644
--- a/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/http/parser/LocalStrings_zh_CN.properties
@@ -24,6 +24,7 @@ http.invalidLeadingZero=非零的IPv4字符可能不包含前导零。
http.invalidOctet=无效字符[{0}].IPv4字符的有效范围为0～255。
http.invalidSegmentEndState=状态[{0}]对于段的结尾无效。
http.noClosingBracket=ipv6 地址缺失一个闭合的圆括号
+http.noOpeningBracket=IPv6地址缺少开括号(
http.singleColonEnd=IPv6地址不能以单个“.”结尾。
http.singleColonStart=一个IPv6地址也许不是以单个冒号":"开头的。
http.tooManyColons=IPv6地址不能包含超过2个连续冒号字符。
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
index b36519e..4b74f50 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_zh_CN.properties
@@ -14,6 +14,7 @@
# limitations under the License.
pojoEndpointBase.onCloseFail=):无法为类型为[{0}]的POJO调用POJO端点的onClose方法
+pojoEndpointBase.onError=在错误发生后，没有为[{0}]配置错误处理
pojoEndpointBase.onOpenFail=无法为类型为[{0}]的POJO调用POJO端点的onOpen方法
pojoEndpointServer.getPojoInstanceFail=创建类型为 [{0}] 的 POJO 实例失败
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af4c3e1..cef3d73 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -193,6 +193,10 @@
Expand the coverage of the Korean translations provided with Apache
Tomcat. (woonsan)
</add>
+ <add>
+ Expand the coverage of the Chinese translations provided with Apache
+ Tomcat. Contributions provided by lins and 磊. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Back-port German translations from 9.0.x
Posted by ma...@apache.org.
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
commit 1f4d3513c439a5638a3ac6e67f42f5acdd81a2e0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:10:39 2019 +0000
Back-port German translations from 9.0.x
---
java/org/apache/coyote/LocalStrings_de.properties | 1 +
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/java/org/apache/coyote/LocalStrings_de.properties b/java/org/apache/coyote/LocalStrings_de.properties
index dc66652..1b66a7a 100644
--- a/java/org/apache/coyote/LocalStrings_de.properties
+++ b/java/org/apache/coyote/LocalStrings_de.properties
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+abstractConnectionHandler.oome=Verarbeitung der Anfrage fehlgeschlagen
abstractConnectionHandler.processorPop=Prozessor [{0}] wurde aus dem Cache genommen.
abstractConnectionHandler.socketexception.debug=SocketExceptions sind normal, werden ignoriert
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2b1b3eb..989ccc7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,10 @@
<code>JAVA_HOME</code> environment variable. Pull request provided by
Alexander Norz. (markt)
</add>
+ <add>
+ Expand the coverage of the German translations provided with Apache
+ Tomcat. Contribution provided by Jens. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org