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 2020/02/06 12:17:07 UTC
[tomcat] branch 8.5.x updated: Back-port translation updates
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 4cbc834 Back-port translation updates
4cbc834 is described below
commit 4cbc8346eeca7f95c98e23e7cee33c9cd6406081
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 6 12:16:46 2020 +0000
Back-port translation updates
---
.../catalina/connector/LocalStrings.properties | 2 +-
.../catalina/manager/LocalStrings.properties | 6 +++---
.../interceptors/LocalStrings_zh_CN.properties | 1 +
.../webresources/LocalStrings_fr.properties | 2 ++
.../webresources/LocalStrings_ko.properties | 2 ++
java/org/apache/coyote/ajp/LocalStrings.properties | 2 +-
.../jasper/resources/LocalStrings_zh_CN.properties | 25 ++++++++++++++++------
.../tomcat/websocket/LocalStrings_fr.properties | 1 +
.../tomcat/websocket/LocalStrings_ko.properties | 1 +
.../tomcat/websocket/LocalStrings_zh_CN.properties | 2 ++
webapps/docs/changelog.xml | 12 +++++++++++
.../WEB-INF/classes/LocalStrings_zh_CN.properties | 6 ++++++
12 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index 0804159..97e284c 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -28,8 +28,8 @@ coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity (
coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization failed
coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed
-coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] requires the AprLifecycleListener which is not available
coyoteConnector.protocolHandlerNoAprLibrary=The configured protocol [{0}] requires the APR/native library which is not available
+coyoteConnector.protocolHandlerNoAprListener=The configured protocol [{0}] requires the AprLifecycleListener which is not available
coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index eaa4d2b..34a63a5 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -114,6 +114,9 @@ htmlManagerServlet.serverTitle=Server Information
htmlManagerServlet.serverVersion=Tomcat Version
htmlManagerServlet.title=Tomcat Web Application Manager
+jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{0}]
+jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] arguments on object name [{2}], which is a [{3}]
+
managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
managerServlet.certsNotAvailable=Certificate information cannot be obtained from this connector at runtime
managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued presence of this file may cause problems.
@@ -177,6 +180,3 @@ managerServlet.vminfo=OK - VM info
statusServlet.complete=Complete Server Status
statusServlet.title=Server Status
-
-jmxProxyServlet.noOperationOnBean=Cannot find operation [{0}] with [{1}] arguments on object name [{2}], which is a [{3}]
-jmxProxyServlet.noBeanFound=Cannot find MBean with object name [{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 1d91d41..15573d8 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
@@ -33,6 +33,7 @@ nonBlockingCoordinator.processCoordinationMessage.failed=处理协调消息时
staticMembershipInterceptor.no.failureDetector=没有TcpFailureDetector。 自动检测静态成员无法正常工作。 通过在TcpFailureDetector下定义StaticMembershipInterceptor，可以自动检测静态成员。
staticMembershipInterceptor.no.pingInterceptor=在没有TcpPingInterceptor的情况下，静态成员的健康检查不会正常工作。只有定义了TcpPingInterceptor，才能使健康检查正常进行。
+staticMembershipInterceptor.sendLocalMember.failed=本地成员通知失败
staticMembershipInterceptor.sendShutdown.failed=关闭通知失败。
tcpFailureDetector.failureDetection.failed=无法进行失败监测，假定成员宕机。[{0}]
diff --git a/java/org/apache/catalina/webresources/LocalStrings_fr.properties b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
index 9939f5a..4ecf78c 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_fr.properties
@@ -25,6 +25,8 @@ cache.backgroundEvictFail=Le processus d''arrière plan d''éviction du cache n'
cache.objectMaxSizeTooBig=La valeur [{0}]kB pour l''objectMaxSize est plus grade que la limite de maxSize/20 son elle a été réduite à [{1}]kB\n
cache.objectMaxSizeTooBigBytes=La valeur de taille d''objet maximale pouvant être mis en cache de [{0}]kB est supérieure à Integer.MAX_VALUE qui est le maximum, la limite a donc été fixée à Integer.MAX_VALUE octets
+cachedResource.invalidURL=La création d''une instance de CachedResourceURLStreamHandler a échouée car l''URL [{0}] est malformée
+
classpathUrlStreamHandler.notFound=Impossible de charger la ressource [{0}] en utilisant le chargeur de classe de contexte du thread ou celui de la classe actuelle
dirResourceSet.manifestFail=Impossible de lire le manifeste depuis [{0}]
diff --git a/java/org/apache/catalina/webresources/LocalStrings_ko.properties b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
index e0d288e..a0a93e5 100644
--- a/java/org/apache/catalina/webresources/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/webresources/LocalStrings_ko.properties
@@ -25,6 +25,8 @@ cache.backgroundEvictFail=백그라운드 캐시 퇴거 (cache eviction) 프로
cache.objectMaxSizeTooBig=objectMaxSize를 위한 값 [{0}]kB이, maxSize/20인 최대한계값 보다 커서, [{1}]kB로 줄여졌습니다.
cache.objectMaxSizeTooBigBytes=[{0}]kB를 캐시하기 위해, 최대 객체 크기로서 지정된 값이 Integer.MAX_VALUE 바이트보다 큰데, Integer.MAX_VALUE는 캐시될 수 있는 최대 크기입니다. 한계 값을 Integer.MAX_VALUE 바이트로 설정하겠습니다.
+cachedResource.invalidURL=URL [{0}]이(가) 유효하지 않기 때문에 CachedResourceURLStreamHandler 인스턴스를 생성할 수 없습니다.
+
classpathUrlStreamHandler.notFound=쓰레드 컨텍스트 클래스로더 또는 현재 클래스의 클래스로더를 사용하여, 리소스 [{0}]을(를) 로드할 수 없습니다.
dirResourceSet.manifestFail=[{0}](으)로부터 manifest를 읽지 못했습니다.
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties b/java/org/apache/coyote/ajp/LocalStrings.properties
index 4dbaf3f..3dc52d9 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -32,6 +32,6 @@ ajpprocessor.request.process=Error processing request
ajpprotocol.noBio=The AJP BIO connector has been removed in Tomcat 8.5.x onwards. The AJP BIO connector configuration has been automatically switched to use the AJP NIO connector instead.
ajpprotocol.noSSL=SSL is not supported with AJP. The SSL host configuration for [{0}] was ignored
-ajpprotocol.nosecret=The AJP Connector is configured with secretRequired="true" but the secret attribute is either null or "". This combination is not valid.
ajpprotocol.noUpgrade=Upgrade is not supported with AJP. The UpgradeProtocol configuration for [{0}] was ignored
ajpprotocol.noUpgradeHandler=Upgrade is not supported with AJP. The HttpUpgradeHandler [{0}] can not be processed
+ajpprotocol.nosecret=The AJP Connector is configured with secretRequired="true" but the secret attribute is either null or "". This combination is not valid.
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 3bda5b6..acbcfbd 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -75,15 +75,28 @@ jsp.error.noFunction=无法使用指定的前缀找到函数[{0}]
jsp.error.not.in.template=在模板文本体中, [{0}] 是不允许的.
jsp.error.outputfolder=无输出目录
jsp.error.overflow=错误：JSP缓冲区溢出
+jsp.error.page.conflict.autoflush=页面指令：“ autoFlush”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.buffer=页面指令：“ buffer”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
jsp.error.page.conflict.contenttype=Page指令：非法出现多次出现的''contentType''具有不同的值（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=页面指令：“ deferredSyntaxAllowedAsLiteral”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
jsp.error.page.conflict.errorpage=页指令：不同值的多次出现“errorPage”的非法值（旧:[{0}],新:[{1}]）
-jsp.error.page.conflict.language=页指令：多次出现不同值的“语言”(旧：[{0}]，新：[{1}])
-jsp.error.page.conflict.session=Page指令：多次出现具有不同值的''session''非法（old：[{0}]，new：[{1}]）
+jsp.error.page.conflict.extends=页面指令：“ extends”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.info=页面指令：“ info”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.iselignored=页面指令：“ isELIgnored”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.iserrorpage=页面指令：“ isErrorPage”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.isthreadsafe=页面指令：“ isThreadSafe”非法多次出现不同值（旧值: [{0}], 新值: [{1}]）
+jsp.error.page.conflict.language=页面指令：“ language” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] ）
+jsp.error.page.conflict.session=页面指令：“session” 非法多次出现不同值（ 旧值：[{0}]，新值：[{1}] ）
jsp.error.page.conflict.trimdirectivewhitespaces=页面指令：违法出现多个有不同的值（旧值：[{0}]，新值：[{1}]）的''trimDirectiveWhitespaces''
-jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的值无效
-jsp.error.page.invalid.import=网页指令：无效引用
-jsp.error.page.invalid.iselignored=页面指令：忽略的无效值
-jsp.error.page.invalid.session=页面提示：session值无效
+jsp.error.page.invalid.buffer=页面指令：buffer 值无效
+jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令：deferredSyntaxAllowedAsLiteral的 值无效
+jsp.error.page.invalid.import=页面指令：import 值无效
+jsp.error.page.invalid.iselignored=页面指令：isELIgnored 值无效
+jsp.error.page.invalid.iserrorpage=页面指令：isErrorPage 值无效
+jsp.error.page.invalid.isthreadsafe=页面指令：isThreadSafe 值无效
+jsp.error.page.invalid.session=页面指令：session 值无效
+jsp.error.page.invalid.trimdirectivewhitespaces=页面指令：trimDirectiveWhitespaces 值无效
+jsp.error.page.language.nonjava=页面指令：language 属性无效
jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
jsp.error.page.noSession=无法访问不参与任何会话的页中的会话作用域
jsp.error.param.invalidUse=jsp:param 不能在jsp:include、jsp:forward或jsp:params等元素外使用
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index 33a2f9e..efb8941 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -35,6 +35,7 @@ caseInsensitiveKeyMap.nullKey=Les clés nulles ne sont pas admises
futureToSendHandler.timeout=Le délai d''attente de l''opération est dépassé après avoir attendu [{0}] [{1}] pour qu''elle se termine
+perMessageDeflate.alreadyClosed=Le transformateur a été fermé et ne peut plus être utilisé
perMessageDeflate.deflateFailed=Impossible de décompresser une trame WebSocket compressée
perMessageDeflate.duplicateParameter=Double définition pour le paramètre d''extension [{0}]
perMessageDeflate.invalidState=Etat invalide
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 7ace6fa..0ddbe24 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ caseInsensitiveKeyMap.nullKey=널인 키들은 허용되지 않습니다.
futureToSendHandler.timeout=[{0}] [{1}]이(가) 완료되기를 기다린 후, 작업 제한 시간을 초과했습니다.
+perMessageDeflate.alreadyClosed=해당 transformer가 이미 닫혔으므로 더이상 사용될 수 없습니다.
perMessageDeflate.deflateFailed=압축된 웹소켓 프레임의 압축을 풀지 못했습니다.
perMessageDeflate.duplicateParameter=[{0}] 확장 파라미터가 중복 정의되어 있습니다.
perMessageDeflate.invalidState=유효하지 않은 상태
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
index 59340f2..4fa3946 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties
@@ -73,6 +73,8 @@ wsWebSocketContainer.missingAnnotation=无法使用POJO类[{0}]，因为它未
wsWebSocketContainer.missingLocationHeader=处理HTTP响应码 [{0}] 失败。响应头缺少Location
wsWebSocketContainer.missingWWWAuthenticateHeader=无法处理HTTP响应代码[{0}]。 缺少WWW-Authenticate标头作为响应
wsWebSocketContainer.pathNoHost=URI中未指定主机
+wsWebSocketContainer.proxyConnectFail=失败连接到已配置的代理 [{0}]。HTTP 响应码是 [{1}]
wsWebSocketContainer.sessionCloseFail=ID 为 [{0}] 的session 没有彻底关闭
wsWebSocketContainer.shutdown=web应用程序正在停止
wsWebSocketContainer.sslEngineFail=无法创建SSLEngine以支持SSL/TLS连接
+wsWebSocketContainer.unsupportedAuthScheme=HTTP响应码处理失败[{0}]. Unsupported Authentication 方案 [{1}] 返回到响应
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6e1cd06..c9dbc21 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,18 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <add>
+ Expand the coverage of the French translations provided with Apache
+ Tomcat. (remm)
+ </add>
+ <add>
+ Expand the coverage of the Chinese translations provided with Apache
+ Tomcat. Contribution provided by BoltzmannWxd. (markt)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.51 (markt)" rtext="release in progress">
<subsection name="Catalina">
diff --git a/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties b/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
index a6cf2aa..a7e0c93 100644
--- a/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
+++ b/webapps/examples/WEB-INF/classes/LocalStrings_zh_CN.properties
@@ -13,16 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cookies.cookies=你的浏览器正在发送下面的cookie：
cookies.make-cookie=创建一个发送到你的浏览器的cookie
cookies.name=名.称:
cookies.no-cookies=你的浏览器未发送任何cookie
cookies.set=你刚刚将以下cookie发送到你的浏览器：
+cookies.title=cookie示例
helloworld.title=你好，世界.
requestheader.title=请求 Header 示例
requestinfo.label.method=方法：
+requestinfo.label.pathinfo=路径信息：
requestinfo.label.protocol=协议：
requestinfo.label.remoteaddr=远程地址：
requestinfo.label.requesturi=请求 URI (:
@@ -34,6 +37,9 @@ requestparams.params-in-req=参数在请求中.
requestparams.title=请求参数示例
sessions.adddata=将数据添加到你的会话中
+sessions.created=已创建的：
+sessions.dataname=会话属性名：
+sessions.datavalue=会话属性值：
sessions.id=会话ID：
sessions.lastaccessed=最后访问：
sessions.title=会话.示例
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org