Author: markt
Date: Fri Dec 14 11:33:28 2018
New Revision: 1848928

URL: http://svn.apache.org/viewvc?rev=1848928&view=rev
Log:
Fixes from woonsan

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties
    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_zh_CN.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
    
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -25,7 +25,7 @@ ReplicationValve.resetDeltaRequest=Clust
 ReplicationValve.send.failure=Unable to perform replication request.
 ReplicationValve.send.invalid.failure=Unable to send session [id={0}] invalid 
message over cluster.
 ReplicationValve.session.found=Context [{0}]: Found session [{1}] but it 
isn''t a ClusterSession.
-ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{0}] 
in request attribute [{1}] is [{2}].
+ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{1}] 
in request attribute [{2}] is [{3}].
 ReplicationValve.session.invalid=Context [{0}]: Requested session [{1}] is 
invalid, removed or not replicated at this node.
 ReplicationValve.stats=Average request time=[{0}] ms with cluster overhead 
time=[{1}] ms for [{2}] requests, [{3}] send requests, [{4}] cross context 
requests, and [{5}] filter requests (Total request=[{6}] ms, total cluster 
request=[{7}] ms).
 

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
 [UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
 [UTF-8] Fri Dec 14 11:33:28 2018
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-domainFilterInterceptor.member.refused=Member was refused to join cluster[{0}]
+domainFilterInterceptor.member.refused=Member [{0}] was refused to join cluster
 domainFilterInterceptor.message.refused=Received message from cluster[{0}] was 
refused.
 
 encryptInterceptor.algorithm.required=Encryption algorithm is required, 
fully-specified e.g. AES/CBC/PKCS5Padding

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -32,7 +32,7 @@ mcastServiceImpl.memberDisappeared.faile
 mcastServiceImpl.packet.tooLong=Multicast packet received was too long, 
dropping package:[{0}]
 mcastServiceImpl.receive.running=McastService.receive already running.
 mcastServiceImpl.recovery=Tribes membership, running recovery thread, 
multicasting is not functional.
-mcastServiceImpl.recovery.failed=Recovery attempt [{0}] failed, trying again 
in [{1}] seconds
+mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed, trying 
again in [{1}] seconds
 mcastServiceImpl.recovery.startFailed=Recovery thread failed to start 
membership service.
 mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership 
service.
 mcastServiceImpl.recovery.successful=Membership recovery was successful.

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties [UTF-8] 
Fri Dec 14 11:33:28 2018
@@ -23,9 +23,6 @@ extensionValidator.extension-validation-
 extensionValidator.failload=Failure loading extension [{0}]
 extensionValidator.web-application-manifest=Web Application Manifest
 
-hexUtil.bad=Bad hexadecimal digit
-hexUtil.odd=Odd number of hexadecimal digits
-
 introspection.classLoadFailed=Failed to load class [{0}]
 
 lifecycleBase.alreadyDestroyed=The destroy() method was called on component 
[{0}] after destroy() had already been called. The second call will be ignored.

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_es.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -22,9 +22,6 @@ extensionValidator.extension-validation-
 extensionValidator.failload=No pude cargar la extensión [{0}]
 extensionValidator.web-application-manifest=Manifiesto de Aplicación Web
 
-hexUtil.bad=Dígito hexadecimal incorrecto
-hexUtil.odd=Número de dígitos hexadecimales impar
-
 parameterMap.locked=No se permiten modificaciones en un ParameterMap bloqueado
 
 resourceSet.locked=No se permiten modificaciones en un ResourceSet bloqueado

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -23,9 +23,6 @@ extensionValidator.extension-validation-
 extensionValidator.failload=Erreur de chargement de l''extension [{0}]
 extensionValidator.web-application-manifest=Web Application Manifest
 
-hexUtil.bad=Mauvais digit hexadecimal
-hexUtil.odd=Nombre impair de digits hexadecimaux
-
 introspection.classLoadFailed=Echec du chargement de la classe [{0}]
 
 lifecycleBase.alreadyDestroyed=La méthode destroy() a été appelée sur le 
composant [{0}] après que destroy() ait déjà été appelé, le deuxième appel sera 
ignoré

Modified: tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -23,9 +23,6 @@ extensionValidator.extension-validation-
 extensionValidator.failload=拡張 [{0}] のロードに失敗しました
 extensionValidator.web-application-manifest=Webアプリケーションマニフェスト
 
-hexUtil.bad=無効な16進数値です
-hexUtil.odd=奇数桁の16進数値です
-
 introspection.classLoadFailed=クラス [{0}] の読み込みに失敗しました。
 
 lifecycleBase.initFail=コンポーネント[{0}] の初期化に失敗しました。

Modified: 
tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LocalStrings_zh_CN.properties 
Fri Dec 14 11:33:28 2018
@@ -18,9 +18,6 @@ customObjectInputStream.nomatch=ç±»ä
 extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: 
请求的拓展[{2}]未找到。
 extensionValidator.web-application-manifest=web 应用程序清单
 
-hexUtil.bad=坏的十六进制数字
-hexUtil.odd=奇数的十六进制数字
-
 introspection.classLoadFailed=加载 class [{0}] 失败
 
 lifecycleBase.initFail=初始化组件[{0}]失败。

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties [UTF-8] Fri 
Dec 14 11:33:28 2018
@@ -20,9 +20,6 @@ ajpmessage.invalidLength=Invalid message
 ajpmessage.null=Cannot append null value
 ajpmessage.overflow=Overflow error for buffer adding [{0}] bytes at position 
[{1}]
 
-ajpnioprotocol.releaseEnd=Done iterating through our connections to release a 
socket channel [{0}] released [{1}]
-ajpnioprotocol.releaseStart=Iterating through our connections to release a 
socket channel [{0}]
-
 ajpprocessor.certs.fail=Certificate conversion failed
 ajpprocessor.failedread=Socket read failed
 ajpprocessor.failedsend=Failed to send AJP message

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_fr.properties Fri Dec 
14 11:33:28 2018
@@ -20,9 +20,6 @@ ajpmessage.invalidLength=Message invalid
 ajpmessage.null=Impossible d'ajouter une valeur nulle.
 ajpmessage.overflow=Débordement du tampon en ajoutant [{0}] octets à la 
position [{1}]
 
-ajpnioprotocol.releaseEnd=Fini d''itérer sur les connections pour libérer un 
canal de socket [{0}] libéré [{1}]
-ajpnioprotocol.releaseStart=Itération parmi les conections pour libérer le 
canal du socket [{0}]
-
 ajpprocessor.certs.fail=La conversion du certificat a échouée
 ajpprocessor.failedread=La lecture sur le socket a échoué
 ajpprocessor.failedsend=Impossible d'envoyer le message AJP

Modified: tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings_ko.properties Fri Dec 
14 11:33:28 2018
@@ -17,8 +17,6 @@ ajpmessage.invalid=서명이 [{
 ajpmessage.invalidLength=길이가 [{0}]인 유효하지 않은 메시지를 
받았습니다.
 ajpmessage.overflow=버퍼에 [{0}] 바이트들을 [{1}] 위치에 
추가하는 동안 오버플로우 오류 발생
 
-ajpnioprotocol.releaseStart=소켓 채널 [{0}]을(를) 제거하기 위해 
연결들을 iterate합니다.
-
 ajpprocessor.certs.fail=인증서를 전환시키지 못했습니다.
 ajpprocessor.header.error=헤더 메시지 파싱이 실패했습니다.
 ajpprocessor.readtimeout=소켓으로부터 데이터를 읽으려는 
시도가 작업시간 초과되었습니다.

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -158,7 +158,6 @@ jsp.error.page.conflict.trimdirectivewhi
 jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=Page directive: invalid 
value for deferredSyntaxAllowedAsLiteral
 jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.invalid.info=Page directive: invalid value for info
 jsp.error.page.invalid.iselignored=Page directive: invalid value for 
isELIgnored
 jsp.error.page.invalid.iserrorpage=Page directive: invalid value for 
isErrorPage
 jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for 
isThreadSafe
@@ -304,14 +303,6 @@ jsp.warning.strictQuoteEscaping=Warning:
 jsp.warning.suppressSmap=Warning: Invalid value for the initParam 
suppressSmap. Will use the default value of "false"
 jsp.warning.tagPreDestroy=Error processing preDestroy on tag instance of [{0}]
 jsp.warning.tagRelease=Error processing release on tag instance of [{0}]
-jsp.warning.unknown.element.in.attribute=Unknown element [{0}] in attribute
-jsp.warning.unknown.element.in.function=Unknown element [{0}] in function
-jsp.warning.unknown.element.in.initParam=Unknown element [{0}] in validator''s 
init-param
-jsp.warning.unknown.element.in.tag=Unknown element [{0}] in tag
-jsp.warning.unknown.element.in.tagfile=Unknown element [{0}] in tag-file
-jsp.warning.unknown.element.in.taglib=Unknown element [{0}] in taglib
-jsp.warning.unknown.element.in.validator=Unknown element [{0}] in validator
-jsp.warning.unknown.element.in.variable=Unknown element [{0}] in variable
 jsp.warning.unknown.sourceVM=Unknown source VM [{0}] ignored
 jsp.warning.unknown.targetVM=Unknown target VM [{0}] ignored
 jsp.warning.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. 
Will use the default value of "false"

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -143,7 +143,6 @@ jsp.error.page.conflict.session=Directiv
 jsp.error.page.conflict.trimdirectivewhitespaces=Directiva de página: es 
ilegal tener múltiples ocurrencias de ''trimDirectivewhitespaces'' con 
diferentes valores (viejo: [{0}], nuevo: [{1}])
 jsp.error.page.invalid.buffer=Directiva Page: valor incorrecto para búfer
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=Directiva de página: 
valor inválido para deferredSyntaxAllowedAsLiteral
-jsp.error.page.invalid.info==Directiva Page: valor incorrecto para info
 jsp.error.page.invalid.iselignored=Directiva Page: valor inválido para 
isELIgnored
 jsp.error.page.invalid.iserrorpage==Directiva Page: valor incorrecto para 
isErrorPage
 jsp.error.page.invalid.isthreadsafe==Directiva Page: valor incorrecto para 
isThreadSafe
@@ -255,14 +254,6 @@ jsp.warning.modificationTestInterval=Avi
 jsp.warning.noJarScanner=Aviso: No se ha puesto org.apache.tomcat.JarScanner 
en ServletContext. Volviendo a la implementación por defecto de JarScanner.
 jsp.warning.recompileOnFail=Aviso: Valor inválido para el initParam 
recompileOnFail. Usaré el valor por defecto de "falso "false"
 jsp.warning.suppressSmap=Aviso: valor incorrecto para el initParam 
suppressSmap. Se usará el valor por defecto de "false"
-jsp.warning.unknown.element.in.attribute=Elemento desconocido [{0}] en 
attribute
-jsp.warning.unknown.element.in.function=Elemento desconocido [{0}] en function
-jsp.warning.unknown.element.in.initParam=Elemento desconocido [{0}] en 
init-param de validator
-jsp.warning.unknown.element.in.tag=Elemento desconocido [{0}] en tag
-jsp.warning.unknown.element.in.tagfile=Elemento desconocido [{0}] en tag-file
-jsp.warning.unknown.element.in.taglib=Elemento desconocido [{0}] en taglib
-jsp.warning.unknown.element.in.validator=Elemento desconocido [{0}] en 
validator
-jsp.warning.unknown.element.in.variable=Elemento desconocido [{0}] en variable
 jsp.warning.xpoweredBy=Aviso: valor incorrecto para el initParam xpoweredBy. 
Se usará el valor por defecto de "false"
 
 jspc.delete.fail=No pude borrar el fichero [{0}]

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -145,7 +145,6 @@ jsp.error.page.conflict.trimdirectivewhi
 jsp.error.page.invalid.buffer=Directive de Page: valeur incorrecte pour 
"buffer"
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=Directive de page: 
valeur invalide pour deferredSyntaxAllowedAsLiteral
 jsp.error.page.invalid.import=Directive de page: valeur invalide pour import
-jsp.error.page.invalid.info=Directive de Page: valeur incorrecte pour info
 jsp.error.page.invalid.iselignored=Directive de page: valeur invalide pour 
isELIgnored
 jsp.error.page.invalid.iserrorpage=Directive de Page: valeur incorrecte pour 
isErrorPage
 jsp.error.page.invalid.isthreadsafe=Directive de Page: valeur incorrecte pour 
isThreadSafe
@@ -273,14 +272,6 @@ jsp.warning.quoteAttributeEL=WARNING: Va
 jsp.warning.recompileOnFail=WARNING: Valeur invalide pour le paramètre 
d'initialisation recompileOnFail, la valeur par défaut "false" sera utilisée
 jsp.warning.strictQuoteEscaping=WARNING: Valeur invalide pour le paramètre 
d'initialisation strictQuoteEscaping, la valeur par défaut "true" sera utilisée
 jsp.warning.suppressSmap=WARNING : valeur invalide d' l'initParam 
suppressSmap. La valeur par défaut "false" sera utilisée
-jsp.warning.unknown.element.in.attribute=Élément inconnu [{0}] dans l''attribut
-jsp.warning.unknown.element.in.function=Elément inconnu [{0}] dans la fonction
-jsp.warning.unknown.element.in.initParam=Elément inconnu [{0}] dans 
l''init-param du validateur
-jsp.warning.unknown.element.in.tag=WARNING: Élément inconnu [{0}] dans le tag
-jsp.warning.unknown.element.in.tagfile=Élément inconnu [{0}] dans le tag-file
-jsp.warning.unknown.element.in.taglib=Elément [{0}] inconnu dans la librairie 
de tag
-jsp.warning.unknown.element.in.validator=Elément inconnu [{0}] dans le 
validateur
-jsp.warning.unknown.element.in.variable=WARNING: Élément inconnu [{0}] dans la 
variable
 jsp.warning.xpoweredBy=WARNING: Valeur invalide pour le paramètre 
d'initialisation xpoweredBy, la valeur par défaut "false" sera utilisée
 
 jspc.delete.fail=Impossible d''effacer le fichier [{0}]

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -120,7 +120,6 @@ jsp.error.page.conflict.language=page指
 jsp.error.page.conflict.session=page指示子: ''session''を異なる値で複数回指定するのは無効です (旧: 
[{0}], 新: [{1}])
 jsp.error.page.invalid.buffer=page指示子: buffer属性の値が無効です
 jsp.error.page.invalid.deferredsyntaxallowedasliteral=ページディレクティブ: 不正な 
deferredSyntaxAllowedLiteral です。
-jsp.error.page.invalid.info=page指示子: info属性の値が無効です
 jsp.error.page.invalid.iselignored=page指示子: isELIgnoredに無効な値が指定されています
 jsp.error.page.invalid.iserrorpage=page指示子: isErrorPage属性の値が無効です
 jsp.error.page.invalid.isthreadsafe=page指示子: isThreadSafeの値が無効です
@@ -216,14 +215,6 @@ jsp.warning.genchararray=警告: initPar
 jsp.warning.keepgen=警告: initParam keepgeneratedの値が無効です。 デフォルト値 "false" を使用します
 jsp.warning.mappedFile=警告: initParam mappedFileの値が無効です。デフォルト値 "false" を使用します
 jsp.warning.suppressSmap=警告: initParam suppressSmapの値が無効です。デフォルト値 "false" 
を使用します
-jsp.warning.unknown.element.in.attribute=attribute中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.function=function中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.initParam=validatorのinit-param中に未知の要素 [{0}] 
があります
-jsp.warning.unknown.element.in.tag=tag中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.tagfile=tag-file中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.taglib=taglib中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.validator=validator中に未知の要素 [{0}] があります
-jsp.warning.unknown.element.in.variable=variable中に未知の要素 [{0}] があります
 jsp.warning.xpoweredBy=警告: Invalid value for the initParam 
xpoweredByの値が無効です。デフォルト値 "false" を使用します
 
 jspc.error.fileDoesNotExist=ファイル引数 [{0}] は存在しません。

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=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ko.properties 
Fri Dec 14 11:33:28 2018
@@ -166,7 +166,6 @@ jsp.warning.maxLoadedJsps=경고:
 jsp.warning.noJarScanner=경고: ServletContext에 
org.apache.tomcat.JarScanner가 설정되지 않았습니다. 기본 JarScanner 
구현 객체를 사용합니다.
 jsp.warning.strictQuoteEscaping=경고: initParam인 strictQuoteEscaping을 
위한 유효한 값이 아님. 기본 값인 "true"를 사용할 것입니다.
 jsp.warning.suppressSmap=경고: 해당 initParam인 suppressSmap을 위해 유
효하지 않은 값입니다. 기본값인 "false"를 사용할 것입니다.
-jsp.warning.unknown.element.in.validator=Validator 내에 알려지지 않은 
엘리먼트: [{0}]
 
 jspc.error.fileDoesNotExist=파일 아규먼트 [{0}]이(가) 존재하지 
않습니다.
 jspc.usage=사용법: jspc <options> [--] <jsp files>\n\

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=1848928&r1=1848927&r2=1848928&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 
Fri Dec 14 11:33:28 2018
@@ -60,7 +60,6 @@ jsp.error.outputfolder=无输å‡�
 jsp.error.overflow=错误:JSP缓冲区溢出
 
jsp.error.page.conflict.errorpage=页指令:不同值的多次出现“errorPage”的非法值(旧:[{0}],新:[{1}])
 
jsp.error.page.invalid.deferredsyntaxallowedasliteral=页面指令:deferredSyntaxAllowedAsLiteral的值æ—
 æ•ˆ
-jsp.error.page.invalid.info=页指令:信息的值无效
 jsp.error.page.invalid.iselignored=页面指令:忽略的无效值
 jsp.error.page.invalid.session=页面提示:session值无效
 jsp.error.page.multi.pageencoding=页指令不能有多次出现的页编码
@@ -103,13 +102,6 @@ jsp.warning.compiler.classfile.delete.fa
 jsp.warning.dumpSmap=警告:初始化堆内存的值无
效。将使用“false”的默认值
 jsp.warning.enablePooling=警告:initParam enablePooling的值无
效。将使用默认值“true”
 jsp.warning.fork=警告:initParam的值无
效。将使用“true”的默认值
-jsp.warning.unknown.element.in.attribute=属性中的未知元素 [{0}]
-jsp.warning.unknown.element.in.function=未知的元素[{0}]在函数。
-jsp.warning.unknown.element.in.tag=标签中的未知元素 [{0}]
-jsp.warning.unknown.element.in.tagfile=标签文件中的未知元素 [{0}]
-jsp.warning.unknown.element.in.taglib=标签文件中的未知元素 [{0}]
-jsp.warning.unknown.element.in.validator=验证器中的未知元素 [{0}]
-jsp.warning.unknown.element.in.variable=变量中的未知元素 [{0}]
 
 jspc.delete.fail=无法删除文件 [{0}]
 jspc.error.fileDoesNotExist=文件参数 [{0}] 不存在

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -31,7 +31,6 @@ jsse.unsupported_ciphers=Some specified
 
 jsseSupport.certTranslationError=Error translating certificate [{0}]
 jsseSupport.clientCertError=Error trying to obtain a certificate from the 
client
-jsseSupport.noCertWant=No client certificate sent for want
 
 jsseUtil.invalidTrustCert=The certificate for [{0}] in the trust store is not 
valid and has, therefore, been excluded in the list of certificates sent to the 
client
 jsseUtil.noCrlSupport=The truststoreProvider [{0}] does not support the 
certificateRevocationFile configuration option

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=1848928&r1=1848927&r2=1848928&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] Fri Dec 14 11:33:28 2018
@@ -31,7 +31,6 @@ jsse.unsupported_ciphers=Quelques uns de
 
 jsseSupport.certTranslationError=Erreur lors de la traduction du certificat 
[{0}]
 jsseSupport.clientCertError=Echec de l'obtention d'un certificat de la part du 
client
-jsseSupport.noCertWant=Aucun certificat client n'a été envoyé alors que cela 
avait été demandé
 
 jsseUtil.invalidTrustCert=Le certificat pour [{0}] dans la base de confiance 
n''est pas valide et est donc exclu de la liste des certificats envoyés au 
client
 jsseUtil.noCrlSupport=Le truststoreProvider [{0}] ne supporte pas d''option de 
configuration certificateRevocationFile

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings_zh_CN.properties 
Fri Dec 14 11:33:28 2018
@@ -20,4 +20,3 @@ jsse.pemParseError=无法从 [{
 
 jsseSupport.certTranslationError=错误的转换证书[{0}]
 jsseSupport.clientCertError=尝试从客户端获取证书时出错
-jsseSupport.noCertWant=无需发送客户端证书

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties 
[UTF-8] Fri Dec 14 11:33:28 2018
@@ -17,7 +17,6 @@ serverContainer.addNotAllowed=No further
 serverContainer.configuratorFail=Failed to create configurator of type [{0}] 
for POJO of type [{1}]
 serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the 
same path [{0}] : existing endpoint was [{1}] and new endpoint is [{2}]
 serverContainer.encoderFail=Unable to create encoder of type [{0}]
-serverContainer.endpointDeploy=Endpoint class [{0}] deploying to path [{1}] in 
ServletContext [{2}]
 serverContainer.missingAnnotation=Cannot deploy POJO class [{0}] as it is not 
annotated with @ServerEndpoint
 serverContainer.missingEndpoint=An Endpoint instance has been request for path 
[{0}] but no matching Endpoint class was found
 serverContainer.pojoDeploy=POJO class [{0}] deploying to path [{1}] in 
ServletContext [{2}]

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties?rev=1848928&r1=1848927&r2=1848928&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties 
Fri Dec 14 11:33:28 2018
@@ -17,7 +17,6 @@ serverContainer.addNotAllowed=Aucune ter
 serverContainer.configuratorFail=Echec de création du configurateur de type 
[{0}] pour le POJO de type [{1}]
 serverContainer.duplicatePaths=Plusieurs terminaisons ne peuvent pas être 
déployés vers le même chemin [{0}]: la terminaison existante était [{1}] et 
la nouvelle est [{2}]
 serverContainer.encoderFail=Impossible de créer un encodeur de type [{0}]
-serverContainer.endpointDeploy=Le point d''entrée de la classe [{0}] est 
déployé sur le chemin [{1}] dans le ServletContext [{2}]
 serverContainer.missingAnnotation=Impossible de déployer la classe POJO [{0}] 
car elle n''a pas été annotée avec @ServerEndpoint
 serverContainer.missingEndpoint=Une instance d''une terminaison a été 
demandée pour le chemin [{0}] mais aucune classe de terminaison correspondante 
n''a été trouvée
 serverContainer.pojoDeploy=La classe d''objet (POJO) [{0}] est déployée au 
chemin [{1}] dans le contexte [{2}]



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

Reply via email to