svn commit: r1850155 - in /tomcat/trunk/java/org/apache: jasper/resources/ tomcat/util/net/jsse/ tomcat/util/net/openssl/

[markt]

Author: markt
Date: Wed Jan  2 09:14:43 2019
New Revision: 1850155

URL: http://svn.apache.org/viewvc?rev=1850155&view=rev
Log:
Catching up on comments received on POEditor

Modified:
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
    
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
    
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
    
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties

Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -80,7 +80,6 @@ jsp.error.function.classnotfound=The cla
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
 jsp.error.internal.filenotfound=Internal Error: File [{0}] not found
-jsp.error.internal.tldinit=Unable to initialize TldLocationsCache: [{0}]
 jsp.error.internal.unexpectedNodeType=Unexpected node type
 jsp.error.invalid.attribute=[{0}] has invalid attribute: [{1}]
 jsp.error.invalid.bean=The value for the useBean class attribute [{0}] is 
invalid.
@@ -252,7 +251,7 @@ jsp.error.usebean.duplicate=useBean: Dup
 jsp.error.usebean.noSession=Illegal for useBean to use session scope when JSP 
page declares (via page directive) that it does not participate in sessions
 jsp.error.var_and_varReader=Only one of 'var' or 'varReader' may be specified
 jsp.error.variable.alias=Both or none of the name-from-attribute and alias 
attributes must be specified in a variable directive
-jsp.error.variable.both.name=Cannot specify both name-given or 
name-from-attribute attributes in a variable directive
+jsp.error.variable.both.name=Cannot specify both name-given and 
name-from-attribute attributes in a variable directive
 jsp.error.variable.either.name=Either name-given or name-from-attribute 
attribute must be specified in a variable directive
 jsp.error.xml.badStandardAction=Invalid standard action: [{0}]
 jsp.error.xml.bad_tag=No tag [{0}] defined in tag library associated with uri 
[{1}]
@@ -263,7 +262,7 @@ jsp.message.jsp_added=Adding JSP for pat
 jsp.message.jsp_queue_created=Created jsp queue with length [{0}] for context 
[{1}]
 jsp.message.jsp_queue_update=Updating JSP for path [{0}] in queue of context 
[{1}]
 jsp.message.jsp_removed_excess=Removing excess JSP for path [{0}] from queue 
of context [{1}]
-jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after [{2}] seconds
+jsp.message.jsp_removed_idle=Removing idle JSP for path [{0}] in context [{1}] 
after [{2}] milliseconds
 jsp.message.jsp_unload_check=Checking JSPs for unload in context [{0}], JSP 
count: [{1}] queue length: [{2}]
 jsp.message.parent_class_loader_is=Parent class loader is: [{0}]
 jsp.message.scratch.dir.is=Scratch dir for the JSP engine is: [{0}]

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -74,7 +74,6 @@ jsp.error.function.classnotfound=La clas
 jsp.error.include.exception=No se puede incluir [{0}]
 jsp.error.include.tag=Tag jsp:include no válido
 jsp.error.internal.filenotfound=Error Interno: Archivo [{0}] no hallado
-jsp.error.internal.tldinit=No pude inicializar TldLocationsCache: [{0}]
 jsp.error.invalid.attribute=[{0}]: Atributo incorrecto, [{1}]
 jsp.error.invalid.bean=El valor el atributo de clsae useBean [{0}] es inválido.
 jsp.error.invalid.directive=Directiva no válida

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -81,7 +81,6 @@ jsp.error.function.classnotfound=La clas
 jsp.error.include.exception=Impossible d''inclure (include) [{0}]
 jsp.error.include.tag=Tag jsp:include incorrect
 jsp.error.internal.filenotfound=Erreur interne: Fichier [{0}] introuvable
-jsp.error.internal.tldinit=Exception lors de l''initialisation de 
TldLocationsCache: [{0}]
 jsp.error.internal.unexpectedNodeType=Type de nœud inattendu
 jsp.error.invalid.attribute=[{0}]: Attribut incorrect: [{1}]
 jsp.error.invalid.bean=La valeur [{0}] de l''attribut de classe useBean est 
invalide

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -75,7 +75,6 @@ jsp.error.function.classnotfound=TLDの�
 jsp.error.include.exception=[{0}] を取り込めません
 jsp.error.include.tag=無効なjsp:includeタグです
 jsp.error.internal.filenotfound=内部エラー: ファイル [{0}] が見つかりません
-jsp.error.internal.tldinit=TldLocationsCacheを初期化中の例外です: [{0}]
 jsp.error.invalid.attribute=[{0}]は無効な属性を持っています: [{1}]
 jsp.error.invalid.bean=useBeanのクラス属性 [{0}] の値が無効です
 jsp.error.invalid.directive=無効なディレクティブです

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
Wed Jan  2 09:14:43 2019
@@ -82,7 +82,6 @@ jsp.error.function.classnotfound=TLDì—
 jsp.error.include.exception=[{0}]을(를) include할 수 없습니다.
 jsp.error.include.tag=유효하지 않은 jsp:include 태그
 jsp.error.internal.filenotfound=내부 오류: 파일 [{0}]을(를) 찾을 수 
없습니다.
-jsp.error.internal.tldinit=TldLocationsCache: [{0}]을(를) 초기화할 수 
없습니다.
 jsp.error.internal.unexpectedNodeType=예기치 않은 노드 타입
 jsp.error.invalid.attribute=[{0}]은(는) 유효하지 않은 속성을 
가지고 있습니다: [{1}]
 jsp.error.invalid.bean=useBean을 위한 class 속성 값 [{0}]은(는) 유
효하지 않습니다.

Modified: 
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
Wed Jan  2 09:14:43 2019
@@ -36,7 +36,6 @@ jsp.error.file.not.found=文.件[{
 jsp.error.include.exception=无法包含[{0}]
 jsp.error.include.tag=无效的jsp:include标签
 jsp.error.internal.filenotfound=内部错误：找不到文件 [{0}]
-jsp.error.internal.tldinit=无法初始化 TldLocationsCache: [{0}]
 jsp.error.invalid.tagdir=标签文件目录 [{0}] 不以"/WEB-INF/tags"开头
 jsp.error.invalid.version=为标签 [{0}] 定义了无效的 JSP 版本号
 jsp.error.ise_on_clear=当缓存大小等于0时调用clear()函数是非法的

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -27,7 +27,6 @@ jsse.openssl.effectiveCiphers=Ciphers us
 jsse.openssl.unknownElement=Unknown element in cipher string: [{0}]
 jsse.pemParseError=Unable to parse the key from [{0}]
 jsse.requested_ciphers_not_supported=None of the ciphers specified are 
supported by the SSL engine : [{0}]
-jsse.unsupported_ciphers=Some specified SSL ciphers are not supported by the 
SSL engine : [{0}]
 
 jsseSupport.certTranslationError=Error translating certificate [{0}]
 jsseSupport.clientCertError=Error trying to obtain a certificate from the 
client

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -27,7 +27,6 @@ jsse.openssl.effectiveCiphers=Chiffres u
 jsse.openssl.unknownElement=Elément inconnu dans la chaîne de chiffres: [{0}]
 jsse.pemParseError=Impossible de parser la clé de [{0}]
 jsse.requested_ciphers_not_supported=Aucun des chiffres spécifiés ne sont 
supportés pas le moteur SSL: [{0}]
-jsse.unsupported_ciphers=Quelques uns des chiffres SSL spécifiés ne sont pas 
supportés par le moteur SSL: [{0}]
 
 jsseSupport.certTranslationError=Erreur lors de la traduction du certificat 
[{0}]
 jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du 
client

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -27,7 +27,6 @@ jsse.openssl.effectiveCiphers=使用さ�
 jsse.openssl.unknownElement=暗号文字列の不明な要素：[{0}]
 jsse.pemParseError=秘密鍵ファイル [{0}] を解析できませんでした。
 jsse.requested_ciphers_not_supported=指定された暗号には SSL エンジン [{0}] の対応する暗号がありません。
-jsse.unsupported_ciphers=指定された一部のSSL暗号は、SSLエンジンでサポートされていません：[{0}]
 
 jsseSupport.clientCertError=クライアントから証明書を取得できません。
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_ko.properties 
Wed Jan  2 09:14:43 2019
@@ -27,7 +27,6 @@ jsse.openssl.effectiveCiphers=사ìš
 jsse.openssl.unknownElement=Cipher 문자열에 알 수 없는 엘리먼트: 
[{0}]
 jsse.pemParseError=[{0}] 파일로부처 키를 파싱해내지 
못했습니다.
 jsse.requested_ciphers_not_supported=지정된 어떤 cipher도 해당 SSL 
엔진에 의해 지원되지 않습니다: [{0}]
-jsse.unsupported_ciphers=SSL 엔진에서 지정한 일부 SSL 암호가 
지원되지 않습니다 : [{0}]
 
 jsseSupport.certTranslationError=인증서 [{0}]에 대한 인증서 변환을 
하는 중 오류 발생
 jsseSupport.clientCertError=해당 클라이언트로부터 인증서를 
취득하는 중 오류 발생

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties 
[UTF-8] Wed Jan  2 09:14:43 2019
@@ -41,7 +41,6 @@ keyManager.nullPrivateKey=Null private k
 openssl.X509FactoryError=Error getting X509 factory instance
 openssl.addedClientCaCert=Added client CA cert: [{0}]
 openssl.applyConf=Applying OpenSSLConfCmd to SSL context
-openssl.assignConf=Assigning SSL context to OpenSSLConfCmd context
 openssl.certificateVerificationFailed=Certificate verification failed
 openssl.checkConf=Checking OpenSSLConf
 openssl.doubleInit=SSL context already initialized, ignoring

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_fr.properties 
Wed Jan  2 09:14:43 2019
@@ -41,7 +41,6 @@ keyManager.nullPrivateKey=La clé priv
 openssl.X509FactoryError=Impossible d'obtenir l'instance de la fabrique X509
 openssl.addedClientCaCert=Ajout du certificat CA du client: [{0}]
 openssl.applyConf=Application de OpenSSLConfCmd au contexte SSL
-openssl.assignConf=Assignation du contexte SSL au contexte de OpenSSLConfCmd
 openssl.certificateVerificationFailed=La vérification du certificat a échoué
 openssl.checkConf=Vérification de OpenSSLConf en cours
 openssl.doubleInit=Le contexte SSL a déjà été initialisé, ignoré

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ja.properties 
Wed Jan  2 09:14:43 2019
@@ -41,7 +41,6 @@ keyManager.nullPrivateKey=Null 秘å�
 
openssl.X509FactoryError=X509ファクトリインスタンスの取得エラー
 openssl.addedClientCaCert=クライアント CA 
証明書を登録しました: [{0}]
 openssl.applyConf=OpenSSLConfCmdをSSLコンテキストに適用します。
-openssl.assignConf=SSLコンテキストをOpenSSLConfCmdコンテキストに割り当てます。
 openssl.certificateVerificationFailed=証明書確認に失敗しました
 openssl.checkConf=OpenSSLConfの確認
 
openssl.doubleInit=SSLコンテキストが既に初期化されています。無視します。

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties?rev=1850155&r1=1850154&r2=1850155&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties 
Wed Jan  2 09:14:43 2019
@@ -41,7 +41,6 @@ keyManager.nullPrivateKey=개인 �
 openssl.X509FactoryError=X509 팩토리 인스턴스를 얻는 중 오류 
발생
 openssl.addedClientCaCert=클라이언트 CA 인증서를 추가했습니다: 
[{0}]
 openssl.applyConf=OpenSSLConfCmd를 SSL 컨텍스트에 적용합니다.
-openssl.assignConf=SSL context를 OpenSSLConfCmd context로 설정합니다.
 openssl.certificateVerificationFailed=인증서 확인에 실패했습니다.
 openssl.checkConf=OpenSSLConf를 점검합니다.
 openssl.doubleInit=SSL context가 이미 초기화되었습니다. 초기화 
재호출은 무시합니다.



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