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:23:33 UTC
[tomcat] branch 7.0.x updated (2fc2044 -> 96fbaf7)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 2fc2044 Remove unused entry
new 64171d7 Correct ordering
new 1237623 Back-port updates to German translations from 8.5.x
new 06a7463 Back-port updates to the French translations from 8.5.x
new 134d573 Back-port updates to the Japanese translations from 8.5.x
new 1ea8fa8 Back-port updates to the Korean translations from 8.5.x
new 96fbaf7 Back-port updates to the Chinese translations from 8,5,x
The 6 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 +
.../catalina/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/LocalStrings_de.properties | 1 +
java/org/apache/coyote/LocalStrings_fr.properties | 1 +
java/org/apache/coyote/LocalStrings_ko.properties | 1 +
.../coyote/http11/LocalStrings_zh_CN.properties | 1 +
.../jasper/resources/LocalStrings_zh_CN.properties | 1 +
.../apache/tomcat/util/buf/LocalStrings.properties | 2 +-
.../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 +
.../websocket/pojo/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 20 ++++++++++++++++++++
19 files changed, 47 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Back-port updates to the French translations from
8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 06a74637e9542f8d42a9c64309b81d40f650dbc9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:21:37 2019 +0000
Back-port updates to the French translations from 8.5.x
---
java/org/apache/catalina/core/LocalStrings_fr.properties | 4 ++++
java/org/apache/coyote/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_fr.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
4 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 552277f..2f8a72f 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 d0b9f25..d583d9e 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -15,6 +15,7 @@
abstractConnectionHandler.error=Erreur de lecture de la requête, ignorée
abstractConnectionHandler.ioexception.debug=Les IOException sont normales et sont ignorées
+abstractConnectionHandler.oome=Echec de la fin de traitement d'une requête
abstractConnectionHandler.socketexception.debug=Les SocketException sont normales et sont ignorées
abstractProcessor.fallToDebug=\ Note : les occurrences suivantes d'erreur d'analyse de la requête seront enregistrées au niveau DEBUG
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 435a9d8..5abe4ec 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas supporté
uDecoder.convertHexDigit.notHex=[{0}] n''est pas un chiffre hexadécimal
+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/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37a929c..31ab8aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,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] 05/06: Back-port updates to the Korean translations from
8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1ea8fa8f3a5ae5eb0312019ac2dcc7d65de30fa8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:22:33 2019 +0000
Back-port updates to the Korean translations from 8.5.x
---
java/org/apache/catalina/core/LocalStrings_ko.properties | 4 ++++
java/org/apache/coyote/LocalStrings_ko.properties | 1 +
java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
webapps/docs/changelog.xml | 4 ++++
4 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties b/java/org/apache/catalina/core/LocalStrings_ko.properties
index 26e738a..ad737f6 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -86,6 +86,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 888a96c..8b0c78b 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -15,6 +15,7 @@
abstractConnectionHandler.error=요청을 읽는 중 오류 발생. 무시합니다.
abstractConnectionHandler.ioexception.debug=IOException들은 정상적이므로, 무시합니다.
+abstractConnectionHandler.oome=요청 처리를 완료하지 못했습니다.
abstractConnectionHandler.socketexception.debug=SocketException들은 정상적인 상태이므로 무시되었습니다.
abstractProcessor.fallToDebug=\n\
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index 8bdce35..d49aa5d 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=문자 인코딩 [{0}]은(는) 지원되지 않습니다.
uDecoder.convertHexDigit.notHex=[{0}]은(는) 16진수 숫자가 아닙니다.
+uDecoder.eof=파일의 끝 (EOF)
+uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.
uDecoder.urlDecode.conversionError=문자셋 [{1}]을(를) 사용하여 [{0}]을(를) 디코드하지 못했습니다.
uDecoder.urlDecode.missingDigit=% 문자 뒤에 두 개의 16진수 숫자들이 이어져야 하기 때문에, [{0}]을(를) 디코드하지 못했습니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 575d61a..ffac708 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -145,6 +145,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] 06/06: Back-port updates to the Chinese translations from
8, 5, x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96fbaf76106d5308dd7c686679776b45a2d2f9d8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:22:55 2019 +0000
Back-port updates to the Chinese translations from 8,5,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/valves/LocalStrings_zh_CN.properties | 1 +
java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 1 +
java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 +
java/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 ++++
10 files changed, 13 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 ef59200..9290c3f 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 a98f87e..30cda59 100644
--- a/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/session/LocalStrings_zh_CN.properties
@@ -41,6 +41,7 @@ standardManager.managerUnload=卸载会话到持久存储的异常
standardManager.unloading.nosessions=没有要卸载的持久会话
standardSession.attributeEvent=会话属性事件侦听器引发异常
+standardSession.getAttribute.ise=getAttribute: 会话已失效
standardSession.getAttributeNames.ise=getAttributeNames：会话已失效
standardSession.getCreationTime.ise=getCreataionTime：会话已经无效
standardSession.getLastAccessedTime.ise=getLastAccessedTime: 会话已失效
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 9e4b10e..d85303d 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -77,6 +77,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/valves/LocalStrings_zh_CN.properties b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
index 08f8e26..084f291 100644
--- a/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_zh_CN.properties
@@ -83,6 +83,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/http11/LocalStrings_zh_CN.properties b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
index 3f61189..cf485d2 100644
--- a/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_zh_CN.properties
@@ -17,6 +17,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/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index b53ea12..acc1fd0 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -144,6 +144,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 336605c..9c14260 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
@@ -22,6 +22,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 ffac708..50fefa6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -149,6 +149,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] 04/06: Back-port updates to the Japanese translations from
8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 134d57373294b692f3e5089fd5bc111ee8e43239
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:22:03 2019 +0000
Back-port updates to the Japanese translations from 8.5.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 1645963..4f78067 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ja.properties
@@ -16,5 +16,7 @@
b2cConverter.unknownEncoding=文字エンコーディング [{0}] は未対応です。
uDecoder.convertHexDigit.notHex=[{0}] は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 31ab8aa..575d61a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,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] 02/06: Back-port updates to German translations from 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 12376235cb1a13649cc00a12f109e697e42bed07
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:21:06 2019 +0000
Back-port updates to German translations from 8.5.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 542ab3a..99409e2 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.socketexception.debug=SocketExceptions sind normal, werden ignoriert
abstractProcessor.fallToDebug=Info: Weitere Vorkommen von Fehlern beim Parsen der Anfragen werden mit DEBUG Level ausgegeben
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 16c50a6..37a929c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,6 +133,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
[tomcat] 01/06: Correct ordering
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 64171d7865584e0ebe83e3671b80e8eaa19413f7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 10:18:55 2019 +0000
Correct ordering
---
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 1f5e8b0..a7dacdf 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -17,8 +17,8 @@ b2cConverter.unknownEncoding=The character encoding [{0}] is not supported
c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new BufferedWriter, WriteConvertor and IntermediateOutputStream.
+uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
uDecoder.eof=End of file (EOF)
uDecoder.noSlash=The encoded slash character is not allowed
-uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set [{1}]
uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character must be followed by two hexademical digits
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org