[tomcat] branch main updated: i18n removed one unused and add one missing

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 3af116c  i18n removed one unused and add one missing
3af116c is described below

commit 3af116c2d5b2cb0ec0bfe1eee63d76d0a362fbbb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 18 18:11:09 2022 +0000

    i18n removed one unused and add one missing
---
 java/org/apache/tomcat/util/net/LocalStrings.properties       | 2 +-
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties    | 1 -
 java/org/apache/tomcat/util/net/LocalStrings_ja.properties    | 1 -
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties    | 1 -
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 3389f01..8c22c84 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -86,7 +86,6 @@ endpoint.nio.nullLatch=Latch cannot be null
 endpoint.nio.nullSocketChannel=Invalid null socket channel while processing poller event
 endpoint.nio.perms.readFail=Failed to set read permissions for Unix domain socket [{0}]
 endpoint.nio.perms.writeFail=Failed to set write permissions for Unix domain socket [{0}]
-endpoint.nio.pollerEventError=Error processing poller event
 endpoint.nio.registerFail=Failed to register socket with selector from poller
 endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
 endpoint.nio.selectorLoopError=Error in selector loop
@@ -143,6 +142,7 @@ sslHostConfig.certificateVerificationInvalid=The certificate verification value
 sslHostConfig.fileNotFound=Configured file [{0}] does not exist
 sslHostConfig.invalid_truststore_password=The provided trust store password could not be used to unlock and/or validate the trust store. Retrying to access the trust store with a null password which will skip validation.
 sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named [{1}] and is for the [{2}] configuration syntax but the SSLHostConfig is being used with the [{3}] configuration syntax
+sslHostConfig.opensslconf.alreadyset=Attempt to set another OpenSSLConf ignored
 sslHostConfig.opensslconf.null=Attempt to set null OpenSSLConf ignored
 sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
 
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index 14128f6..801cd2e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -85,7 +85,6 @@ endpoint.nio.nullLatch=Le latch ne peut être null
 endpoint.nio.nullSocketChannel=Le canal du socket est invalide car null lors du traitement de l'évênement du poller
 endpoint.nio.perms.readFail=Echec d''ajout des permissions en lecture pour le socket de domaine Unix [{0}]
 endpoint.nio.perms.writeFail=Echec d''ajout des permissions en écriture pour le socket de domaine Unix [{0}]
-endpoint.nio.pollerEventError=Erreur lors du traitement de l'évènement du poller
 endpoint.nio.registerFail=Echec d'enregistrement du socket avec le sélecteur du poller
 endpoint.nio.selectorCloseFail=Impossible de fermer le sélecteur lors de la fermeture du poller
 endpoint.nio.selectorLoopError=Erreur dans la boucle du sélecteur
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
index 69d71e1..3fb7f1e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ja.properties
@@ -85,7 +85,6 @@ endpoint.nio.nullLatch=Latch に null は指定できません。
 endpoint.nio.nullSocketChannel=pollerイベントの処理中の無効なnullソケットチャネル
 endpoint.nio.perms.readFail=Unixドメインソケット [{0}] の読み取り権限の設定に失敗しました
 endpoint.nio.perms.writeFail=Unixドメインソケット [{0}] の書き込み権限の設定に失敗しました
-endpoint.nio.pollerEventError=poller イベント処理中のエラー
 endpoint.nio.registerFail=Pollerからソケットのセレクタに登録できませんでした。
 endpoint.nio.selectorCloseFail=Pollerを閉じるときにセレクターを閉じることができませんでした。
 endpoint.nio.selectorLoopError=セレクタの処理ループ中のエラー
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
index 6c186ce..fddc8b1 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_ko.properties
@@ -85,7 +85,6 @@ endpoint.nio.nullLatch=Latch가 널이어서는 안됩니다.
 endpoint.nio.nullSocketChannel=PollerEvent를 처리하는 중 유효하지 않은 널 소켓 채널이 발견되었습니다.
 endpoint.nio.perms.readFail=Unix 도메인 소켓 [{0}]에 읽기를 허용하는 데에 실패했습니다.
 endpoint.nio.perms.writeFail=Unix 도메인 소켓 [{0}]에 쓰기를 허용하는 데에 실패했습니다.
-endpoint.nio.pollerEventError=Poller 이벤트를 처리하는 중 오류 발생
 endpoint.nio.registerFail=Poller로부터의 selector와 함께, 소켓을 등록하지 못했습니다.
 endpoint.nio.selectorCloseFail=Poller를 닫을 때, selector를 닫지 못했습니다.
 endpoint.nio.selectorLoopError=Selector 루프 내에서 오류 발생
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
index 63123a1..e3a8227 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties
@@ -85,7 +85,6 @@ endpoint.nio.nullLatch=闩锁不能为空
 endpoint.nio.nullSocketChannel=处理轮训事件时出现无效的空套接字通道
 endpoint.nio.perms.readFail=设置Unix域套接字[{0}]的读取权限失败
 endpoint.nio.perms.writeFail=设置Unix域套接字[{0}]的写取权限失败
-endpoint.nio.pollerEventError=处理轮询器事件时出错
 endpoint.nio.registerFail=无法用轮询器中的选择器注册套接字。
 endpoint.nio.selectorCloseFail=关闭轮询器时未能关闭选择器
 endpoint.nio.selectorLoopError=选择器循环出错

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org