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/08/15 21:57:09 UTC

[tomcat] branch 7.0.x updated: Use [...] to delimited values inserted into messages

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


The following commit(s) were added to refs/heads/7.0.x by this push:
     new d13c735  Use [...] to delimited values inserted into messages
d13c735 is described below

commit d13c735563cffc030491277dd379412b7dc9ac60
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 15 22:55:32 2019 +0100

    Use [...] to delimited values inserted into messages
---
 java/javax/el/LocalStrings_de.properties           |  2 +-
 .../catalina/connector/LocalStrings.properties     |  6 +-
 .../catalina/connector/LocalStrings_es.properties  | 20 ++---
 .../catalina/connector/LocalStrings_fr.properties  | 10 +--
 .../catalina/connector/LocalStrings_ja.properties  | 10 +--
 .../apache/catalina/core/LocalStrings.properties   | 86 ++++++++++---------
 .../catalina/core/LocalStrings_es.properties       | 96 +++++++++++-----------
 .../catalina/core/LocalStrings_fr.properties       | 72 ++++++++--------
 .../catalina/core/LocalStrings_ja.properties       | 76 +++++++++--------
 .../apache/catalina/deploy/LocalStrings.properties |  2 +-
 .../apache/catalina/ha/tcp/LocalStrings.properties | 14 +---
 .../catalina/ha/tcp/LocalStrings_es.properties     | 14 +---
 .../apache/catalina/loader/LocalStrings.properties | 24 +++---
 .../catalina/loader/LocalStrings_es.properties     | 24 +++---
 .../catalina/loader/LocalStrings_fr.properties     | 22 ++---
 .../catalina/loader/LocalStrings_ja.properties     | 22 ++---
 .../catalina/manager/LocalStrings.properties       | 18 ++--
 .../catalina/manager/LocalStrings_de.properties    | 73 ++++++++--------
 .../catalina/manager/LocalStrings_es.properties    | 18 ++--
 .../catalina/manager/LocalStrings_fr.properties    | 18 ++--
 .../catalina/manager/LocalStrings_ja.properties    | 18 ++--
 .../apache/catalina/realm/LocalStrings.properties  | 26 +++---
 .../catalina/realm/LocalStrings_es.properties      | 20 ++---
 .../catalina/realm/LocalStrings_fr.properties      |  2 +-
 .../catalina/realm/LocalStrings_ja.properties      |  2 +-
 .../catalina/session/LocalStrings.properties       | 18 ++--
 .../catalina/session/LocalStrings_es.properties    | 16 ++--
 .../catalina/session/LocalStrings_fr.properties    | 16 ++--
 .../catalina/session/LocalStrings_ja.properties    | 16 ++--
 .../catalina/startup/LocalStrings.properties       | 14 ++--
 .../catalina/startup/LocalStrings_es.properties    | 14 ++--
 .../catalina/startup/LocalStrings_fr.properties    |  4 +-
 .../catalina/startup/LocalStrings_ja.properties    | 10 +--
 .../tribes/membership/LocalStrings.properties      |  2 +-
 .../tribes/membership/LocalStrings_es.properties   |  2 +-
 .../tribes/transport/LocalStrings.properties       |  8 +-
 .../tribes/transport/LocalStrings_es.properties    | 10 +--
 .../apache/catalina/valves/LocalStrings.properties |  2 +-
 .../catalina/valves/LocalStrings_es.properties     |  2 +-
 .../catalina/valves/LocalStrings_fr.properties     |  2 +-
 .../catalina/valves/LocalStrings_ja.properties     |  4 +-
 java/org/apache/coyote/ajp/LocalStrings.properties |  6 +-
 .../apache/coyote/ajp/LocalStrings_es.properties   |  6 +-
 .../apache/coyote/http11/LocalStrings.properties   |  8 +-
 .../coyote/http11/LocalStrings_es.properties       |  8 +-
 .../coyote/http11/LocalStrings_fr.properties       |  2 +-
 .../coyote/http11/LocalStrings_ja.properties       |  2 +-
 java/org/apache/el/Messages.properties             | 40 ++++-----
 java/org/apache/el/Messages_es.properties          | 38 ++++-----
 .../jasper/resources/LocalStrings.properties       |  2 +-
 .../jasper/resources/LocalStrings_es.properties    |  2 +-
 .../naming/resources/LocalStrings.properties       | 38 ++++-----
 .../naming/resources/LocalStrings_es.properties    | 38 ++++-----
 .../naming/resources/LocalStrings_fr.properties    | 26 +++---
 .../naming/resources/LocalStrings_ja.properties    | 28 +++----
 .../util/net/jsse/res/LocalStrings.properties      | 18 ++--
 .../util/net/jsse/res/LocalStrings_es.properties   |  6 +-
 .../util/net/jsse/res/LocalStrings_fr.properties   |  2 +-
 .../util/net/jsse/res/LocalStrings_ja.properties   |  2 +-
 .../tomcat/util/net/res/LocalStrings.properties    | 18 ++--
 .../tomcat/util/net/res/LocalStrings_es.properties | 24 +++---
 .../tomcat/util/net/res/LocalStrings_fr.properties |  4 +-
 .../tomcat/util/net/res/LocalStrings_ja.properties |  6 +-
 63 files changed, 572 insertions(+), 587 deletions(-)

diff --git a/java/javax/el/LocalStrings_de.properties b/java/javax/el/LocalStrings_de.properties
index 9e1c397..4e75d79 100644
--- a/java/javax/el/LocalStrings_de.properties
+++ b/java/javax/el/LocalStrings_de.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ ''[{0}]'' nicht finden
+expressionFactory.cannotFind=Kann die ExpressionFactory mit dem Typ [{0}] nicht finden
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index c432a9a..f87bb84 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -25,7 +25,7 @@ coyoteAdapter.debug=The variable [{0}] has value [{1}]
 coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an existing request
 coyoteAdapter.parsePathParam=Unable to parse the path parameters using encoding [{0}]. The path parameters in the URL will be ignored.
 
-coyoteConnector.MapperRegistration=register Mapper: {0}
+coyoteConnector.MapperRegistration=register Mapper: [{0}]
 coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
 coyoteConnector.invalidPort=The connector cannot start since the specified port value of [{0}] is invalid
 coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity (see RFC 2616 Section 9.6)
@@ -48,8 +48,8 @@ coyoteRequest.getContextPath.ise=Unable to find match between the canonical cont
 coyoteRequest.getInputStream.ise=getReader() has already been called for this request
 coyoteRequest.getReader.ise=getInputStream() has already been called for this request
 coyoteRequest.gssLifetimeFail=Failed to obtain remaining lifetime for user principal [{0}]
-coyoteRequest.listenerStart=Exception sending context initialized event to listener instance of class {0}
-coyoteRequest.listenerStop=Exception sending context destroyed event to listener instance of class {0}
+coyoteRequest.listenerStart=Exception sending context initialized event to listener instance of class [{0}]
+coyoteRequest.listenerStop=Exception sending context destroyed event to listener instance of class [{0}]
 coyoteRequest.maxPostSizeExceeded=The multi-part request contained parameter data (excluding uploaded files) that exceeded the limit for maxPostSize set on the associated connector
 coyoteRequest.parseParameters=Exception thrown whilst processing POSTed parameters
 coyoteRequest.postTooLarge=Parameters were not parsed because the size of the posted data was too big. Use the maxPostSize attribute of the connector to resolve this if the application should accept large POSTs.
diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties b/java/org/apache/catalina/connector/LocalStrings_es.properties
index 8983ec1..1bd6207 100644
--- a/java/org/apache/catalina/connector/LocalStrings_es.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_es.properties
@@ -20,7 +20,7 @@ coyoteAdapter.checkRecycled.response=Se encontró una respuesta no reciclable y
 coyoteAdapter.debug=La variable [{0}] tiene el valor [{1}]
 coyoteAdapter.parsePathParam=No puedo analizar los parámetros de ruta mediante la codificación [{0}]. Se ignoran los parámetros de la URL.
 
-coyoteConnector.MapperRegistration=Mapeador de registro: {0}
+coyoteConnector.MapperRegistration=Mapeador de registro: [{0}]
 coyoteConnector.cannotRegisterProtocol=No puedo registrar MBean para el Protocolo
 coyoteConnector.invalidPort=El conector no puede inciar debido a que el valor del puerto especificado [{0}] no es válido
 coyoteConnector.parseBodyMethodNoTrace=El método TRACE NO DEBE DE incluir una entidad (vea RFC 2616 Sección 9.6)
@@ -41,8 +41,8 @@ coyoteRequest.chunkedPostTooLarge=No se han analizado los parámetros porque la
 coyoteRequest.getInputStream.ise=getReader() ya ha sido llamado para este requerimiento
 coyoteRequest.getReader.ise=getInputStream() ya ha sido llamado para este requerimiento
 coyoteRequest.gssLifetimeFail=Fallo al obtener el tiempo de vida restante para el usuario principal [{0}]\n
-coyoteRequest.listenerStart=Excepción enviando evento inicializado de contexto a instancia de escuchador de clase {0}
-coyoteRequest.listenerStop=Excepción enviando evento destruído de contexto a instancia de escuchador de clase {0}
+coyoteRequest.listenerStart=Excepción enviando evento inicializado de contexto a instancia de escuchador de clase [{0}]
+coyoteRequest.listenerStop=Excepción enviando evento destruído de contexto a instancia de escuchador de clase [{0}]
 coyoteRequest.noLoginConfig=No se ha configurado mecanismo de autenticación para este contexto
 coyoteRequest.parseParameters=Excepción lanzada al procesar parámetros POST
 coyoteRequest.postTooLarge=No se analizaron los parámetros porque la medida de los datos enviados era demasiado grande. Usa el atributo maxPostSize del conector para resolver esto en caso de que la aplicación debiera de aceptar POSTs más grandes.
@@ -63,14 +63,14 @@ inputBuffer.streamClosed=Flujo cerrado
 
 mapperListener.addMBeanListenerFail=No pude añadir escuchador de notificación MBean para el conector [{0}] en dominio [{1}]. La adición de Máquinas, Contextos y Arropadores no serán visibles al conector.
 mapperListener.lifecycleListenerFail=No pude añadir escuchador de Ciclo de Vida al objeto [{0}]. Los cambios en el estado del objeto pueden no ser reflejados correctamente en el mapeador para el conector [{1}] en el dominio [{2}].
-mapperListener.registerContext=Registrar Contexto {0} para el conector [{1}]
-mapperListener.registerHost=Registrar máquina {0} en dominio {1} para el conector [{2}]
-mapperListener.registerWrapper=Registrar Arropador (Wrapper) {0} en Contexto {1}
+mapperListener.registerContext=Registrar Contexto [{0}] para el conector [{1}]
+mapperListener.registerHost=Registrar máquina [{0}] en dominio [{1}] para el conector [{2}]
+mapperListener.registerWrapper=Registrar Arropador (Wrapper) [{0}] en Contexto [{1}]
 mapperListener.removeMBeanListenerFail=No pude quitar escuchador de notificación MBean para el conector [{0}] en dominio [{1}]. Esto puede dar lugar a pérdida de memoria.
-mapperListener.unknownDefaultHost=Máquina por defecto desconocida: {0} para el conector [{1}]
-mapperListener.unregisterContext=Desregistrar Contexto {0} para el conector [{1}]
-mapperListener.unregisterHost=Desregistrar máquina {0} en dominio {1} para el conector [{2}]
-mapperListener.unregisterWrapper=Desregistrar Arropador (Wrapper) {0} en Contexto {1}
+mapperListener.unknownDefaultHost=Máquina por defecto desconocida: [{0}] para el conector [{1}]
+mapperListener.unregisterContext=Desregistrar Contexto [{0}] para el conector [{1}]
+mapperListener.unregisterHost=Desregistrar máquina [{0}] en dominio [{1}] para el conector [{2}]
+mapperListener.unregisterWrapper=Desregistrar Arropador (Wrapper) [{0}] en Contexto [{1}]
 
 requestFacade.nullRequest=El objeto de requerimiento ha sido reciclado y ya no está asociado con esta fachada
 
diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 8772c5c..aa80d96 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -43,8 +43,8 @@ coyoteRequest.getContextPath.ise=Impossible de trouver une correspondance entre
 coyoteRequest.getInputStream.ise="getReader()" a déjà été appelé pour cette requête
 coyoteRequest.getReader.ise="getInputStream()" a déjà été appelé pour cette requête
 coyoteRequest.gssLifetimeFail=Echec d''obtention de la durée de vie restante pour le "user principal" [{0}]
-coyoteRequest.listenerStart=Une exception s''est produite lors de l''envoi de l''évènement contexte initialisé à l''instance de classe d''écoute {0}
-coyoteRequest.listenerStop=Une exception s''est produite lors de l''envoi de l''évènement contexte détruit à l''instance de classe d''écoute {0}
+coyoteRequest.listenerStart=Une exception s''est produite lors de l''envoi de l''évènement contexte initialisé à l''instance de classe d''écoute [{0}]
+coyoteRequest.listenerStop=Une exception s''est produite lors de l''envoi de l''évènement contexte détruit à l''instance de classe d''écoute [{0}]
 coyoteRequest.maxPostSizeExceeded=La requête multi part contenait des données de paramètres (en excluant les fichiers envoyés) dont la taille a excédé la limite maxPostSize fixée sur le connecteur associé
 coyoteRequest.parseParameters=Exception lors du traitement des paramètres envoyés par POST
 coyoteRequest.postTooLarge=Les paramètres n'ont pas été évalués car la taille des données postées est trop important. Utilisez l'attribut maxPostSize du connecteur pour corriger ce problème si votre application doit accepter des POSTs importants.
@@ -67,9 +67,9 @@ coyoteResponse.setBufferSize.ise=Impossible de changer la taille du tampon aprè
 
 inputBuffer.streamClosed=Le flux a été fermé
 
-mapperListener.registerContext=Enregistrement du contexte {0}
-mapperListener.registerWrapper=Enregistrement de l''enrobeur (wrapper) {0} dans le contexte {1}
-mapperListener.unregisterContext=Désenregistrement du contexte {0}
+mapperListener.registerContext=Enregistrement du contexte [{0}]
+mapperListener.registerWrapper=Enregistrement de l''enrobeur (wrapper) [{0}] dans le contexte [{1}]
+mapperListener.unregisterContext=Désenregistrement du contexte [{0}]
 
 request.asyncNotSupported=Un filtre ou un Servlet de la chaîne actuelle ne supporte pas le mode asynchrone
 request.fragmentInDispatchPath=Le fragment dans le chemin de dispatch [{0}] a été enlevé
diff --git a/java/org/apache/catalina/connector/LocalStrings_ja.properties b/java/org/apache/catalina/connector/LocalStrings_ja.properties
index 89579a0..efcb122 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ja.properties
@@ -43,8 +43,8 @@ coyoteRequest.getContextPath.ise=標準的なコンテキストパス[{0}]とユ
 coyoteRequest.getInputStream.ise=getReader()はこのリクエストに対して既に呼び出されています
 coyoteRequest.getReader.ise=getInputStream()はこのリクエストに対して既に呼び出されています
 coyoteRequest.gssLifetimeFail=ユーザープリンシパル [{0}] の残りの寿命(秒単位) を取得できません。
-coyoteRequest.listenerStart=クラス {0} のリスナインスタンスに初期化イベントを送信中に例外が投げられました
-coyoteRequest.listenerStop=クラス {0} のリスナインスタンスに廃棄イベントを送信中に例外が投げられました
+coyoteRequest.listenerStart=クラス [{0}] のリスナインスタンスに初期化イベントを送信中に例外が投げられました
+coyoteRequest.listenerStop=クラス [{0}] のリスナインスタンスに廃棄イベントを送信中に例外が投げられました
 coyoteRequest.maxPostSizeExceeded=マルチパートリクエストには、関連するコネクタで設定されたmaxPostSizeの制限を超えたパラメータデータ(アップロードされたファイルを除く)が含まれていました。
 coyoteRequest.parseParameters=POST パラメーターの処理中に例外を投げました。
 coyoteRequest.postTooLarge=POSTされたデータが大きすぎたので、パラメータが構文解析できませんでした。そのアプリケーションが巨大なPOSTを受け付けねばならない場合には、これを解決するためにコネクタのmaxPostSize属性を使用してください。
@@ -67,9 +67,9 @@ coyoteResponse.setBufferSize.ise=データが既に書き込まれた後でバ
 
 inputBuffer.streamClosed=ストリームはクローズしています
 
-mapperListener.registerContext=コンテキスト {0} を登録します
-mapperListener.registerWrapper=コンテキスト {1} にラッパ {0} を登録します
-mapperListener.unregisterContext=コンテキスト {0} の登録を抹消します
+mapperListener.registerContext=コンテキスト [{0}] を登録します
+mapperListener.registerWrapper=コンテキスト [{1}] にラッパ [{0}] を登録します
+mapperListener.unregisterContext=コンテキスト [{0}] の登録を抹消します
 
 request.asyncNotSupported=現在のチェーンのフィルタまたはサーブレットは非同期操作をサポートしていません。
 request.notAsync=非同期モードではないリクエストでこのメソッドを呼び出すことはできません。(例えば isAsyncStarted() が false を返す場合)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 8c78f97..ee35f1f 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -21,7 +21,7 @@ applicationContext.addListener.iae.wrongType=The type specified [{0}] is not one
 applicationContext.addListener.ise=Listeners cannot be added to context [{0}] as the context has been initialised
 applicationContext.addRole.ise=Roles cannot be added to context [{0}] as the context has been initialised
 applicationContext.addServlet.ise=Servlets cannot be added to context [{0}] as the context has been initialised
-applicationContext.addSessionCookieConfig.ise=Session Cookie configuration cannot be set for context {0} as the context has been initialised
+applicationContext.addSessionCookieConfig.ise=Session Cookie configuration cannot be set for context [{0}] as the context has been initialised
 applicationContext.attributeEvent=Exception thrown by attributes event listener
 applicationContext.illegalDispatchPath=An application attempted to obtain a request dispatcher with an illegal path [{0}] that was rejected because it contained an encoded directory traversal attempt
 applicationContext.invalidFilterName=Unable to add filter definition due to invalid filter name [{0}].
@@ -105,8 +105,8 @@ asyncContextImpl.requestEnded=The request associated with the AsyncContext has a
 asyncContextImpl.response.ise=It is illegal to call getResponse() after complete() or any of the dispatch() methods has been called
 
 containerBase.backgroundProcess.cluster=Exception processing cluster [{0}] background process
-containerBase.backgroundProcess.loader=Exception processing loader {0} background process
-containerBase.backgroundProcess.manager=Exception processing manager {0} background process
+containerBase.backgroundProcess.loader=Exception processing loader [{0}] background process
+containerBase.backgroundProcess.manager=Exception processing manager [{0}] background process
 containerBase.backgroundProcess.realm=Exception processing realm [{0}] background process
 containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of background thread [{0}]
 containerBase.backgroundProcess.valve=Exception processing valve [{0}] background process
@@ -148,10 +148,10 @@ standardContext.alreadyStarted=Context has already been started
 standardContext.applicationListener=Error configuring application listener of class [{0}]
 standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s)
 standardContext.backgroundProcess.instanceManager=Exception processing instance manager [{0}] background process
-standardContext.badRequest=Invalid request path ({0}).
+standardContext.badRequest=Invalid request path [{0}].
 standardContext.cluster.noManager=No manager found. Checking if cluster manager should be used. Cluster configured: [{0}], Application distributable: [{1}]
 standardContext.configurationFail=One or more components marked the context as not correctly configured
-standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can never be matched.
+standardContext.crlfinurl=The URL pattern [{0}] contains a CR or LF and so can never be matched.
 standardContext.duplicateListener=The listener [{0}] is already configured for this context. The duplicate definition has been ignored.
 standardContext.errorPage.error=Error page location [{0}] must start with a ''/''
 standardContext.errorPage.required=ErrorPage cannot be null
@@ -177,11 +177,11 @@ standardContext.loginConfig.loginWarning=WARNING: Form login page [{0}] must sta
 standardContext.loginConfig.required=LoginConfig cannot be null
 standardContext.manager=Configured a manager of class [{0}]
 standardContext.managerFail=The session manager failed to start
-standardContext.mappingError=MAPPING configuration error for relative URI {0}
+standardContext.mappingError=MAPPING configuration error for relative URI [{0}]
 standardContext.namingResource.destroy.fail=Failed to destroy old naming resources
 standardContext.namingResource.init.fail=Failed to init new naming resources
 standardContext.noResourceJar=Resource JARs are not supported. The JAR found at [{0}] will not be used to provide static content for context with name [{1}]
-standardContext.notFound=The requested resource ({0}) is not available.
+standardContext.notFound=The requested resource [{0}] is not available.
 standardContext.notReloadable=Reloading is disabled on this Context
 standardContext.notStarted=Context with name [{0}] has not yet been started
 standardContext.notWrapper=Child of a Context must be a Wrapper
@@ -195,10 +195,10 @@ standardContext.predestroy.required=Both fully qualified class name and method n
 standardContext.reloadingCompleted=Reloading Context with name [{0}] is completed
 standardContext.reloadingFailed=Reloading this Context failed due to previous errors
 standardContext.reloadingStarted=Reloading Context with name [{0}] has started
-standardContext.requestListener.requestDestroy=Exception sending request destroyed lifecycle event to listener instance of class {0}
+standardContext.requestListener.requestDestroy=Exception sending request destroyed lifecycle event to listener instance of class [{0}]
 standardContext.requestListener.requestInit=Exception sending request initialized lifecycle event to listener instance of class [{0}]
 standardContext.requestListenerConfig.added=Added request listener Valve
-standardContext.requestListenerConfig.error=Exception adding request listener Valve: {0}
+standardContext.requestListenerConfig.error=Exception adding request listener Valve: [{0}]
 standardContext.requestListenerStartFailed=Failed to start request listener valve successfully
 standardContext.resourcesInit=Error initializing static Resources
 standardContext.resourcesStart=Error starting static Resources
@@ -214,15 +214,15 @@ standardContext.startFailed=Context [{0}] startup failed due to previous errors
 standardContext.startingContext=Exception starting Context with name [{0}]
 standardContext.startingLoader=Exception starting Loader
 standardContext.startingManager=Exception starting Manager
-standardContext.startingWrapper=Exception starting Wrapper for servlet {0}
+standardContext.startingWrapper=Exception starting Wrapper for servlet [{0}]
 standardContext.stop.asyncWaitInterrupted=Interrupt received while waiting unloadDelay milliseconds for in-flight asynchronous requests to complete. Context stop will continue without further delay.
 standardContext.stoppingContext=Exception stopping Context with name [{0}]
 standardContext.stoppingLoader=Exception stopping Loader
 standardContext.stoppingManager=Exception stopping Manager
-standardContext.stoppingWrapper=Exception stopping Wrapper for servlet {0}
-standardContext.urlDecode=Cannot URL decode request path {0}
+standardContext.stoppingWrapper=Exception stopping Wrapper for servlet [{0}]
+standardContext.urlDecode=Cannot URL decode request path [{0}]
 standardContext.urlPattern.patternWarning=WARNING: URL pattern [{0}] must start with a ''/'' in Servlet 2.4
-standardContext.urlValidate=Cannot validate URL decoded request path {0}
+standardContext.urlValidate=Cannot validate URL decoded request path [{0}]
 standardContext.workCreateException=Failed to determine absolute work directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
 standardContext.workCreateFail=Failed to create work directory [{0}] for context [{1}]
 standardContext.workPath=Exception obtaining work path for context [{0}]
@@ -231,49 +231,49 @@ standardContextValve.acknowledgeException=Failed to acknowledge request with a 1
 
 standardEngine.alreadyStarted=Engine has already been started
 standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from system property
-standardEngine.mappingError=MAPPING configuration error for server name {0}
+standardEngine.mappingError=MAPPING configuration error for server name [{0}]
 standardEngine.noHost=No Host matches server name [{0}]
 standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
 standardEngine.notHost=Child of an Engine must be a Host
 standardEngine.notParent=Engine cannot have a parent Container
 standardEngine.notStarted=Engine has not yet been started
-standardEngine.unfoundHost=Virtual host {0} not found
+standardEngine.unfoundHost=Virtual host [{0}] not found
 standardEngine.unknownHost=No server host specified in this request
-standardEngine.unregister.mbeans.failed=Error in destroy() for mbean file {0}
+standardEngine.unregister.mbeans.failed=Error in destroy() for mbean file [{0}]
 
-standardHost.accessBase=Cannot access document base directory {0}
+standardHost.accessBase=Cannot access document base directory [{0}]
 standardHost.alreadyStarted=Host has already been started
-standardHost.appBase=Application base directory {0} does not exist
+standardHost.appBase=Application base directory [{0}] does not exist
 standardHost.asyncStateError=An asynchronous request was received for processing that was neither an async dispatch nor an error to process
 standardHost.clientAbort=Remote Client Aborted Request, IOException: [{0}]
 standardHost.configNotAllowed=Use of configuration file is not allowed
 standardHost.configRequired=URL to configuration file is required
-standardHost.docBase=Document base directory {0} already exists
+standardHost.docBase=Document base directory [{0}] already exists
 standardHost.installBase=Only web applications in the Host web application directory can be installed
-standardHost.installError=Error deploying application at context path {0}
-standardHost.installing=Installing web application at context path {0} from URL {1}
-standardHost.installingWAR=Installing web application from URL {0}
-standardHost.installingXML=Processing Context configuration file URL {0}
+standardHost.installError=Error deploying application at context path [{0}]
+standardHost.installing=Installing web application at context path [{0}] from URL [{1}]
+standardHost.installingWAR=Installing web application from URL [{0}]
+standardHost.installingXML=Processing Context configuration file URL [{0}]
 standardHost.invalidErrorReportValveClass=Couldn''t load specified error report valve class: [{0}]
-standardHost.mappingError=MAPPING configuration error for request URI {0}
+standardHost.mappingError=MAPPING configuration error for request URI [{0}]
 standardHost.noContext=No Context configured to process this request
 standardHost.noHost=No Host configured to process this request
 standardHost.notContext=Child of a Host must be a Context
 standardHost.notStarted=Host has not yet been started
 standardHost.nullName=Host name is required
-standardHost.pathFormat=Invalid context path: {0}
-standardHost.pathMatch=Context path {0} must match the directory or WAR file name: {1}
-standardHost.pathMissing=Context path {0} is not currently in use
+standardHost.pathFormat=Invalid context path: [{0}]
+standardHost.pathMatch=Context path [{0}] must match the directory or WAR file name: [{1}]
+standardHost.pathMissing=Context path [{0}] is not currently in use
 standardHost.pathRequired=Context path is required
-standardHost.pathUsed=Context path {0} is already in use
+standardHost.pathUsed=Context path [{0}] is already in use
 standardHost.problematicAppBase=Using an empty string for appBase on host [{0}] will set it to CATALINA_BASE, which is a bad idea
-standardHost.removeError=Error removing application at context path {0}
-standardHost.removing=Removing web application at context path {0}
-standardHost.start=Starting web application at context path {0}
-standardHost.stop=Stopping web application at context path {0}
-standardHost.unfoundContext=Cannot find context for request URI {0}
+standardHost.removeError=Error removing application at context path [{0}]
+standardHost.removing=Removing web application at context path [{0}]
+standardHost.start=Starting web application at context path [{0}]
+standardHost.stop=Stopping web application at context path [{0}]
+standardHost.unfoundContext=Cannot find context for request URI [{0}]
 standardHost.warRequired=URL to web application archive is required
-standardHost.warURL=Invalid URL for web application archive: {0}
+standardHost.warURL=Invalid URL for web application archive: [{0}]
 
 standardHostValue.customStatusFailed=Custom error page [{0}] could not be dispatched correctly
 
@@ -286,9 +286,9 @@ standardService.connector.initFailed=Failed to initialize connector [{0}]
 standardService.connector.pauseFailed=Failed to pause connector [{0}]
 standardService.connector.startFailed=Failed to start connector [{0}]
 standardService.connector.stopFailed=Failed to stop connector [{0}]
-standardService.initialize.failed=Service initializing at {0} failed
+standardService.initialize.failed=Service initializing at [{0}] failed
 standardService.onameFail=MBean name specified for Service [{0}] is not valid
-standardService.register.failed=Error registering Service at domain {0}
+standardService.register.failed=Error registering Service at domain [{0}]
 standardService.start.name=Starting service [{0}]
 standardService.stop.name=Stopping service [{0}]
 
@@ -296,8 +296,8 @@ standardThreadExecutor.onameFail=MBean name specified for Thread Executor [{0}]
 
 standardWrapper.allocate=Error allocating a servlet instance
 standardWrapper.allocateException=Allocate exception for servlet [{0}]
-standardWrapper.containerServlet=Loading container servlet {0}
-standardWrapper.createFilters=Create filters exception for servlet {0}
+standardWrapper.containerServlet=Loading container servlet [{0}]
+standardWrapper.createFilters=Create filters exception for servlet [{0}]
 standardWrapper.deallocateException=Deallocate exception for servlet [{0}]
 standardWrapper.destroyException=Servlet.destroy() for servlet [{0}] threw exception
 standardWrapper.destroyInstance=InstanceManager.destroy() for servlet [{0}] threw exception
@@ -308,10 +308,10 @@ standardWrapper.exception3=Root Cause:
 standardWrapper.initException=Servlet.init() for servlet [{0}] threw exception
 standardWrapper.instantiate=Error instantiating servlet class [{0}]
 standardWrapper.isUnavailable=Servlet [{0}] is currently unavailable
-standardWrapper.jasperLoader=Using Jasper classloader for servlet {0}
-standardWrapper.jspFile.format=JSP file {0} does not start with a ''/'' character
-standardWrapper.missingClass=Wrapper cannot find servlet class {0} or a class it depends on
-standardWrapper.missingLoader=Wrapper cannot find Loader for servlet {0}
+standardWrapper.jasperLoader=Using Jasper classloader for servlet [{0}]
+standardWrapper.jspFile.format=JSP file [{0}] does not start with a ''/'' character
+standardWrapper.missingClass=Wrapper cannot find servlet class [{0}] or a class it depends on
+standardWrapper.missingLoader=Wrapper cannot find Loader for servlet [{0}]
 standardWrapper.notChild=Wrapper container may not have child containers
 standardWrapper.notClass=No servlet class has been specified for servlet [{0}]
 standardWrapper.notContext=Parent container of a Wrapper must be a Context
@@ -320,8 +320,6 @@ standardWrapper.notServlet=Class [{0}] is not a Servlet
 standardWrapper.releaseFilters=Release filters exception for servlet [{0}]
 standardWrapper.serviceException=Servlet.service() for servlet [{0}] in context with path [{1}] threw exception
 standardWrapper.serviceExceptionRoot=Servlet.service() for servlet [{0}] in context with path [{1}] threw exception [{2}] with root cause
-standardWrapper.statusHeader=HTTP Status {0} - {1}
-standardWrapper.statusTitle=Tomcat Error Report
 standardWrapper.unavailable=Marking servlet [{0}] as unavailable
 standardWrapper.unloadException=Servlet [{0}] threw unload() exception
 standardWrapper.unloading=Cannot allocate servlet [{0}] because it is being unloaded
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties b/java/org/apache/catalina/core/LocalStrings_es.properties
index ac8c173..a627f8e 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -20,7 +20,7 @@ applicationContext.addListener.iae.wrongType=El tipo especificado [{0}] no es un
 applicationContext.addListener.ise=No se pueden añadir escuchadores al contexto [{0}], una vez que ha sido inicializado.
 applicationContext.addRole.ise=No se pueden añadir roles al contexto [{0}], una vez que ha sido inicializado.
 applicationContext.addServlet.ise=No se pueden añadir servlets al contexto [{0}], una vez que ha sido inicializado.
-applicationContext.addSessionCookieConfig.ise=No se puede poner la configuración de Cookie de Sesión para el contexto {0}, una vez que éste ha sido inicializado.
+applicationContext.addSessionCookieConfig.ise=No se puede poner la configuración de Cookie de Sesión para el contexto [{0}], una vez que éste ha sido inicializado.
 applicationContext.attributeEvent=Excepción lanzada por escuchador de eventos de atributos
 applicationContext.invalidServletName=Incapaz de añadir la definición servlet devido a que el nombre servlet no es válido [{0}].
 applicationContext.lookup.error=No pude localizar el recurso [{0}] en el contexto [{1}]
@@ -73,19 +73,19 @@ aprListener.tooLateForFIPSMode=No se pudo fijar  setFIPSMode: SSL ya ha sido ini
 
 asyncContextImpl.requestEnded=El requerimiento asociado con AsyncContext ya ha completado su procesamiento.
 
-containerBase.alreadyStarted=Ya ha sido arrancado el Contenedor {0}
+containerBase.alreadyStarted=Ya ha sido arrancado el Contenedor [{0}]
 containerBase.backgroundProcess.cluster=Excepción al procesar clúster [{0}] de proceso en segundo plano
-containerBase.backgroundProcess.loader=Excepción al procesar cargador {0} de proceso en segundo plano
-containerBase.backgroundProcess.manager=Excepción al procesar gestor {0} de proceso en segundo plano
+containerBase.backgroundProcess.loader=Excepción al procesar cargador [{0}] de proceso en segundo plano
+containerBase.backgroundProcess.manager=Excepción al procesar gestor [{0}] de proceso en segundo plano
 containerBase.backgroundProcess.realm=Excepción al procesar reino [{0}] de proceso en segundo plano
 containerBase.backgroundProcess.unexpectedThreadDeath=Muerte inesperada de un hilo en segudo plano [{0}]\n
 containerBase.backgroundProcess.valve=Excepción al procesar válvula [{0}] de proceso en segundo plano
 containerBase.notConfigured=No se ha configurado Válvula básica
-containerBase.notStarted=No se ha arrancado el Contenedor {0}
+containerBase.notStarted=No se ha arrancado el Contenedor [{0}]
 
 defaultInstanceManager.invalidInjection=Método inválido para el recurso de inserción de anotación
-defaultInstanceManager.privilegedFilter=El filtro de clase {0} es privilegiado y no puede ser cargado mediante esta apliación web
-defaultInstanceManager.privilegedServlet=El Servlet de clase {0} es privilegiado y no puede ser cargado mediante esta aplicación
+defaultInstanceManager.privilegedFilter=El filtro de clase [{0}] es privilegiado y no puede ser cargado mediante esta apliación web
+defaultInstanceManager.privilegedServlet=El Servlet de clase [{0}] es privilegiado y no puede ser cargado mediante esta aplicación
 defaultInstanceManager.restrictedContainerServlet=El acceso a la clase [{0}] esta prohibido. Esta es una clase restringida  ( implementa la interface ContainerServlet ). Una applicación web debe ser configurada como privilegiada para ser capaz de cargarla
 defaultInstanceManager.restrictedFiltersResource=No se ha hallado el fichero de propiedades restringidas de filtros
 defaultInstanceManager.restrictedListenersResource=No se ha hallado el fichero de propiedades restringidas de escuchadores
@@ -109,14 +109,14 @@ naming.invalidEnvEntryValue=La entrada de Entorno [{0}] tiene un valor inválido
 naming.jmxRegistrationFailed=No pude registrar en JMX: [{0}]
 naming.namingContextCreationFailed=Falló la creación del contexto de nombres (naming): [{0}]
 naming.unbindFailed=No pude descambiar (unbind) objecto: [{0}]
-naming.wsdlFailed=No pude hallar fichero wsdl: {0}
+naming.wsdlFailed=No pude hallar fichero wsdl: [{0}]
 
 standardContext.alreadyStarted=Ya se ha arrancado el Contexto
 standardContext.applicationListener=Error configurando escuchador de aplicación de clase [{0}]
 standardContext.applicationSkipped=Se ha saltado la instalación de escuchadores de aplicación debido a error(es) previo(s)
-standardContext.badRequest=Trayectoria de requerimiento inválida ({0}).
+standardContext.badRequest=Trayectoria de requerimiento inválida [{0}].
 standardContext.cluster.noManager=No se ha hallado el gestor. Revisando si hay que usar el gestor de clúster. Clúster configurado: [{0}], Aplicación distribuíble: [{1}]
-standardContext.crlfinurl=El modelo URL "{0}" contiene un CR o LR y por ello nunca coincidirá.
+standardContext.crlfinurl=El modelo URL [{0}] contiene un CR o LR y por ello nunca coincidirá.
 standardContext.duplicateListener=El escuchador [{0}] ya está configurado para este contexto. La definición duplicada ha sido ignorada.
 standardContext.errorPage.error=La localización de la página de error [{0}] debe de comenzar con ''/''
 standardContext.errorPage.required=ErrorPage no puede ser nulo
@@ -138,11 +138,11 @@ standardContext.loginConfig.loginWarning=AVISO: La página de login de Formulari
 standardContext.loginConfig.required=LoginConfig no puede ser nula
 standardContext.manager=Configurado un gestor de la clase [{0}]
 standardContext.managerFail=El manejador de sesiones falló al iniciar
-standardContext.mappingError=Error de configuración de MAPEO para URI relativa {0}
+standardContext.mappingError=Error de configuración de MAPEO para URI relativa [{0}]
 standardContext.namingResource.destroy.fail=No pude destruir recursos de viejo nombre
 standardContext.namingResource.init.fail=No pude inicializar recursos de nuevo nombre
 standardContext.noResourceJar=Los JARs de recurso no están soportados. El JAR hallado en [{0}] no se utilizará para proveer de contenido estático para el contexto con nombre [{1}]
-standardContext.notFound=El recurso requerido ({0}) no se encuentra disponible
+standardContext.notFound=El recurso requerido [{0}] no se encuentra disponible
 standardContext.notReloadable=Está desactivada la recarga en este Contexto
 standardContext.notStarted=Aún no se ha arrancado el Contexto [{0}]
 standardContext.notWrapper=El Hijo de un Contexto debe de ser un Arropador (Wrapper)
@@ -153,10 +153,10 @@ standardContext.predestroy.duplicate=Definición duplicada de método @PreDestro
 standardContext.reloadingCompleted=Se ha completado la recarga de este Contexto
 standardContext.reloadingFailed=Falló la recarga de este Contexto debido a errores previos
 standardContext.reloadingStarted=Ha comenzado la recarga de Contexto [{0}]
-standardContext.requestListener.requestDestroy=Una excepción durante el envío de requerimiento ha destruído un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener) {0}
+standardContext.requestListener.requestDestroy=Una excepción durante el envío de requerimiento ha destruído un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener) [{0}]
 standardContext.requestListener.requestInit=Una excepción durante el envío de requerimiento ha iniciado un evento de ciclo de vida (lifecycle event) para la instancia de clase a la escucha (listener) [{0}]
 standardContext.requestListenerConfig.added=Añadida Válvula de escuchador de requerimiento
-standardContext.requestListenerConfig.error=Excepción añadiendo Válvula de escuchador de requerimiento: {0}
+standardContext.requestListenerConfig.error=Excepción añadiendo Válvula de escuchador de requerimiento: [{0}]
 standardContext.requestListenerStartFailed=No pude arrancar válvula de escuchador de requerimiento con exito
 standardContext.resourcesStart=Error arrancando Recursos estáticos
 standardContext.securityConstraint.mixHttpMethod=No está permitido mezclar <http-method> y <http-method-omission> en la misma  colección de recursos web
@@ -168,14 +168,14 @@ standardContext.startFailed=Falló en arranque del Contexto [{0}] debido a error
 standardContext.startingContext=Excepción arrancando Contexto con nombre [{0}]
 standardContext.startingLoader=Excepción arrancando Cargador
 standardContext.startingManager=Excepción arrancando Gestor
-standardContext.startingWrapper=Excepción arrancando Arropador (Wrapper) para servlet {0}
+standardContext.startingWrapper=Excepción arrancando Arropador (Wrapper) para servlet [{0}]
 standardContext.stoppingContext=Excepción parando Context [{0}]
 standardContext.stoppingLoader=Excepción parando Cargador
 standardContext.stoppingManager=Excepción parando Gestor
-standardContext.stoppingWrapper=Excepción parando Arropador (Wrapper) para servlet {0}
-standardContext.urlDecode=No puedo decodificar URL de trayectoria de requerimiento {0}
+standardContext.stoppingWrapper=Excepción parando Arropador (Wrapper) para servlet [{0}]
+standardContext.urlDecode=No puedo decodificar URL de trayectoria de requerimiento [{0}]
 standardContext.urlPattern.patternWarning=AVISO: el patrón URL [{0}] debe de comenzar con ''/'' en Servlet 2.4
-standardContext.urlValidate=No puedo validar trayectoria de requerimiento de URL decodificada {0}
+standardContext.urlValidate=No puedo validar trayectoria de requerimiento de URL decodificada [{0}]
 standardContext.workCreateException=No pude determinar directorio absoluto de trabajo a partir del directorio [{0}] y  CATALINA_HOME [{1}] para el contexto [{2}]
 standardContext.workCreateFail=No pude crear el directorio de trabajo [{0}] para el contexto [{1}]
 standardContext.workPath=Excepción obteniendo ruta de trabajo para el contexto [{0}]
@@ -184,47 +184,47 @@ standardContextValve.acknowledgeException=No pude reconocer el requerimiento con
 
 standardEngine.alreadyStarted=Ya ha sido arrancado el Motor
 standardEngine.jvmRouteFail=No pude poner el atributo jvmRoute del Motor para la propiedad del sistema
-standardEngine.mappingError=Error de configuración de MAPEO para nombre de servidor {0}
+standardEngine.mappingError=Error de configuración de MAPEO para nombre de servidor [{0}]
 standardEngine.noHost=No hay Máquina que coincida con nombre de servidor [{0}]
 standardEngine.noHostHeader=Requerimiento HTTP/1.1 sin Máquina: cabecera
 standardEngine.notHost=El Hijo de un Motor debe de ser un Máquina
 standardEngine.notParent=El Motor no puede tener un Contenedor padre
 standardEngine.notStarted=Aún no se ha arrancado el Motor
-standardEngine.unfoundHost=Máquina virtual {0} no hallada
+standardEngine.unfoundHost=Máquina virtual [{0}] no hallada
 standardEngine.unknownHost=No se ha especificado máquina servidora en este requerimiento
-standardEngine.unregister.mbeans.failed=Error al destruir (destroy()) para fichero mbean {0}
+standardEngine.unregister.mbeans.failed=Error al destruir (destroy()) para fichero mbean [{0}]
 
-standardHost.accessBase=No puedo acceder a directorio base de documento {0}
+standardHost.accessBase=No puedo acceder a directorio base de documento [{0}]
 standardHost.alreadyStarted=Ya ha sido arrancada la Máquina
-standardHost.appBase=No existe el directorio base de aplicación {0}
+standardHost.appBase=No existe el directorio base de aplicación [{0}]
 standardHost.clientAbort=El Cliente Remoto Abortó el Requerimiento, IOException: [{0}]
 standardHost.configNotAllowed=No se permite el uso del archivo de configuración
 standardHost.configRequired=Es necesario poner la URL a archivo de configuración
-standardHost.docBase=Ya existe el directorio base de documento {0}
+standardHost.docBase=Ya existe el directorio base de documento [{0}]
 standardHost.installBase=Sólo se pueden instalar aplicaciones web en el directorio de aplicaciones web de Máquina
-standardHost.installError=Error desplegando aplicación en trayectoria de contexto {0}
-standardHost.installing=Instalando aplicaciones web en trayectoria de contexto {0} desde URL {1}
-standardHost.installingWAR=Instalando aplicación web desde URL {0}
-standardHost.installingXML=Procesando URL de archivo de configuración de Contexto {0}
+standardHost.installError=Error desplegando aplicación en trayectoria de contexto [{0}]
+standardHost.installing=Instalando aplicaciones web en trayectoria de contexto [{0}] desde URL [{1}]
+standardHost.installingWAR=Instalando aplicación web desde URL [{0}]
+standardHost.installingXML=Procesando URL de archivo de configuración de Contexto [{0}]
 standardHost.invalidErrorReportValveClass=No pude cargar clase especifiada de válvula de informe de error: [{0}]
-standardHost.mappingError=Error de configuración de MAPEO para URI de requerimiento {0}
+standardHost.mappingError=Error de configuración de MAPEO para URI de requerimiento [{0}]
 standardHost.noContext=No se ha configurado Contexto para procesar este requerimiento
 standardHost.noHost=No se ha configurado Máquina para procesar este requerimiento
 standardHost.notContext=El Hijo de una Máquina debe de ser un Contexto
 standardHost.notStarted=Aún no se ha arrancado la Máquina
 standardHost.nullName=Es necesario poner el nombre de Máquina
-standardHost.pathFormat=Trayectoria de contexto inválida: {0}
-standardHost.pathMatch=La trayectoria de Contexto {0} debe de coincidir con el nombre de directorio o de archivo WAR: {1}
-standardHost.pathMissing=La trayectoria de Contexto {0} no está en uso en este momento
+standardHost.pathFormat=Trayectoria de contexto inválida: [{0}]
+standardHost.pathMatch=La trayectoria de Contexto [{0}] debe de coincidir con el nombre de directorio o de archivo WAR: [{1}]
+standardHost.pathMissing=La trayectoria de Contexto [{0}] no está en uso en este momento
 standardHost.pathRequired=Es necesario poner la trayectoria de Contexto
-standardHost.pathUsed=Ya está en uso la trayectoria de Contexto {0}
-standardHost.removeError=Error quitando aplicación en trayectoria de contexto {0}
-standardHost.removing=Quitando aplicación web en trayectoria de contexto {0}
-standardHost.start=Arrancando aplicación web en trayectoria de contexto {0}
-standardHost.stop=Parando aplicación web en trayectoria de contexto {0}
-standardHost.unfoundContext=No puedo hallar contexto para URI de requerimiento {0}
+standardHost.pathUsed=Ya está en uso la trayectoria de Contexto [{0}]
+standardHost.removeError=Error quitando aplicación en trayectoria de contexto [{0}]
+standardHost.removing=Quitando aplicación web en trayectoria de contexto [{0}]
+standardHost.start=Arrancando aplicación web en trayectoria de contexto [{0}]
+standardHost.stop=Parando aplicación web en trayectoria de contexto [{0}]
+standardHost.unfoundContext=No puedo hallar contexto para URI de requerimiento [{0}]
 standardHost.warRequired=Es necesario poner la URL a archivo de aplicación web
-standardHost.warURL=URL inválida para archivo de aplicación web: {0}
+standardHost.warURL=URL inválida para archivo de aplicación web: [{0}]
 
 standardServer.onameFail=El nombre MBean especificado para el Servidor [{0}] no es válido
 standardServer.shutdownViaPort=Se ha recibido un comando de apagado a través del puerto de apagado. Parando la instancia del Servidor.
@@ -234,9 +234,9 @@ standardService.connector.initFailed=No pude inicializar el conector [{0}]
 standardService.connector.pauseFailed=No pude pausar el conector [{0}]
 standardService.connector.startFailed=No pude arrancar el conector [{0}]
 standardService.connector.stopFailed=No pude parar el conector [{0}]
-standardService.initialize.failed=Servicio inicializando en {0} falló
+standardService.initialize.failed=Servicio inicializando en [{0}] falló
 standardService.onameFail=El nombre MBean especificado para el Servicio [{0}] no es válido
-standardService.register.failed=Error registrando servicio en dominio {0}
+standardService.register.failed=Error registrando servicio en dominio [{0}]
 standardService.start.name=Arrancando servicio [{0}]
 standardService.stop.name=Parando servicio [{0}]
 
@@ -244,8 +244,8 @@ standardThreadExecutor.onameFail=El nombre MBean especificado para el Ejecutor d
 
 standardWrapper.allocate=Error reservando espacio para una instancia de servlet
 standardWrapper.allocateException=Excepción de reserva de espacio para servlet [{0}]
-standardWrapper.containerServlet=Cargando servlet de contenedor {0}
-standardWrapper.createFilters=Excepción de creación de filtros para servlet {0}
+standardWrapper.containerServlet=Cargando servlet de contenedor [{0}]
+standardWrapper.createFilters=Excepción de creación de filtros para servlet [{0}]
 standardWrapper.deallocateException=Excepción de recuperación de espacio para servlet [{0}]
 standardWrapper.destroyException=Servlet.destroy() para servlet [{0}] lanzó excepción
 standardWrapper.exception0=Informe de Excepción de Tomcat
@@ -255,10 +255,10 @@ standardWrapper.exception3=Causa Raíz:
 standardWrapper.initException=Servlet.init() para servlet [{0}] lanzó excepción
 standardWrapper.instantiate=Error instanciando clase de servlet [{0}]
 standardWrapper.isUnavailable=El Servlet [{0}] no está disponible en este momento
-standardWrapper.jasperLoader=Usando cargador de clases (classloader) de Jasper para servlet {0}
-standardWrapper.jspFile.format=El archivo JSP {0} no comienza con carácter ''/''
-standardWrapper.missingClass=El Arropador (Wrapper) no puede hallar clase de servlet {0} o una clase de la que depende
-standardWrapper.missingLoader=El Arropador (Wrapper) no puede hallar Cargador para servlet {0}
+standardWrapper.jasperLoader=Usando cargador de clases (classloader) de Jasper para servlet [{0}]
+standardWrapper.jspFile.format=El archivo JSP [{0}] no comienza con carácter ''/''
+standardWrapper.missingClass=El Arropador (Wrapper) no puede hallar clase de servlet [{0}] o una clase de la que depende
+standardWrapper.missingLoader=El Arropador (Wrapper) no puede hallar Cargador para servlet [{0}]
 standardWrapper.notChild=El contenedor de Arropador (Wrapper) no puede tener contenedores hijo
 standardWrapper.notClass=No se ha especificado clase de servlet para servlet [{0}]
 standardWrapper.notContext=El contenedor padre para un Arropador (Wrapper) debe de ser un Contexto
@@ -267,8 +267,6 @@ standardWrapper.notServlet=La Clase [{0}] no es un Servlet
 standardWrapper.releaseFilters=Excepción de Liberación de filtros para servlet [{0}]
 standardWrapper.serviceException=Servlet.service() para servlet [{0}] lanzó excepción
 standardWrapper.serviceExceptionRoot=El Servlet.service() para el servlet [{0}] en el contexto con ruta [{1}] lanzó la excepción [{2}] con causa raíz
-standardWrapper.statusHeader=HTTP Estado {0} - {1}
-standardWrapper.statusTitle=Informe de Error de Tomcat
 standardWrapper.unavailable=Marcando el servlet [{0}] como no disponible
 standardWrapper.unloadException=El Servlet [{0}] lanzó excepción unload()
 standardWrapper.unloading=No se puede reservar espacio para servlet [{0}] porque está siendo descargado
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index b558b24..227f054 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -103,13 +103,13 @@ asyncContextImpl.request.ise=Il est illégal d'appeler getRequest() après que c
 asyncContextImpl.requestEnded=La requête associée avec l'AsyncContext est déjà terminée
 asyncContextImpl.response.ise=Il est illégal d'appeler getResponse() après que complete() ou n'importe laquelle des méthodes de dispatch a été appelée
 
-containerBase.alreadyStarted=Le conteneur {0} a déjà été démarré
+containerBase.alreadyStarted=Le conteneur [{0}] a déjà été démarré
 containerBase.backgroundProcess.cluster=Une exception s''est produite lors du traitement d''arrière plan du cluster [{0}]
 containerBase.backgroundProcess.realm=Exception lors du traitement d''arrière plan du realm [{0}]
 containerBase.backgroundProcess.unexpectedThreadDeath=Mort inattendue du fil d''exécution d''arrière-plan ("background thread") [{0}]
 containerBase.backgroundProcess.valve=Exception lors du traitement d''arrière plan de la valve [{0}]
 containerBase.notConfigured=Aucune Valve basique (basic valve) n''a été configurée
-containerBase.notStarted=Le conteneur {0} n''a pas été démarré
+containerBase.notStarted=Le conteneur [{0}] n''a pas été démarré
 containerBase.nullName=Le nom d'un conteneur ne peut être null
 containerBase.threadedStartFailed=Un conteneur fils a échoué pendant son démarrage
 containerBase.threadedStopFailed=Erreur lors de l'arrêt d'un conteneur fils
@@ -147,7 +147,7 @@ standardContext.alreadyStarted=Le contexte a déjà été démarré
 standardContext.applicationListener=Erreur lors de la configuration de la classe d''écoute de l''application (application listener) [{0}]
 standardContext.applicationSkipped=L'installation des écouteurs (listeners) de l'application a été sautée suite aux erreurs précédentes
 standardContext.backgroundProcess.instanceManager=Exception lors du traitement d''arrière plan du gestionnaire d''instances [{0}]
-standardContext.badRequest=Chemin de requête invalide ({0}).
+standardContext.badRequest=Chemin de requête invalide [{0}].
 standardContext.cluster.noManager=Aucun gestionnaire de session trouvé, vérification de l''utilisation éventuelle du gestionnaire de session fourni par le cluster; cluster configuré: [{0}], application distribuable: [{1}]
 standardContext.configurationFail=Un ou plusieurs composants ont marqué ce contexte comme n'étant pas correctement configuré
 standardContext.duplicateListener=L''écouteur [{0}] est déjà configuré pour le contexte, la double déclaration a été ignorée
@@ -175,11 +175,11 @@ standardContext.loginConfig.loginWarning=WARNING: La page de connexion du formul
 standardContext.loginConfig.required="LoginConfig" ne peut être nul
 standardContext.manager=Configuré un gestionnaire de la classe [{0}]
 standardContext.managerFail=Echec lors du démarrage du gestionnaire de sessions
-standardContext.mappingError=Erreur dans la configuration d''association (mapping configuration) pour l''URI relative {0}
+standardContext.mappingError=Erreur dans la configuration d''association (mapping configuration) pour l''URI relative [{0}]
 standardContext.namingResource.destroy.fail=Echec de destruction des anciennes ressources JNDI
 standardContext.namingResource.init.fail=Echec d'initialisation des nouvelles ressources JNDI
 standardContext.noResourceJar=Les JARs de ressources ne sont pas supportés, le JAR trouvé à [{0}] ne sera pas utilisé pour fournir des ressources statiques pour le contexte nommé [{1}]
-standardContext.notFound=La ressource demandée ({0}) n''est pas disponible.
+standardContext.notFound=La ressource demandée [{0}] n''est pas disponible.
 standardContext.notReloadable=Le rechargement est désactivé pour ce contexte
 standardContext.notStarted=Le contexte [{0}] n''a pas encore été démarré
 standardContext.notWrapper=Le fils du contexte (child of context) doit être un enrobeur (wrapper)
@@ -193,10 +193,10 @@ standardContext.predestroy.required=Les noms qualifiés de la classe et de la m
 standardContext.reloadingCompleted=Le rechargement de ce contexte est terminé
 standardContext.reloadingFailed=Le rechargement de ce contexte a échoué suite à une erreur précédente
 standardContext.reloadingStarted=Le rechargement du contexte [{0}] a démarré
-standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requête a détruit un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute (listener) {0}
+standardContext.requestListener.requestDestroy=Une exception lors de l''envoi de requête a détruit un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute (listener) [{0}]
 standardContext.requestListener.requestInit=Une exception lors de l''envoi de requête a initié un évènement cycle de vie (lifecycle event) pour l''instance de classe à l''écoute (listener) [{0}]
 standardContext.requestListenerConfig.added=Ajout de la valve d''écoute
-standardContext.requestListenerConfig.error=Exception lors de l''ajout de la valve d''écoute de requête: {0}
+standardContext.requestListenerConfig.error=Exception lors de l''ajout de la valve d''écoute de requête: [{0}]
 standardContext.requestListenerStartFailed=Echec démarrage des Valves d''écoute
 standardContext.resourcesInit=Erreur d'initialisation des ressources statiques
 standardContext.resourcesStart=Erreur lors du démarrage des ressources statiques
@@ -212,15 +212,15 @@ standardContext.startFailed=Erreur de démarrage du contexte [{0}] suite aux err
 standardContext.startingContext=Exception lors du démarrage du contexte [{0}]
 standardContext.startingLoader=Exception an démarrage du "Loader"
 standardContext.startingManager=Exception an démarrage du "Manager"
-standardContext.startingWrapper=Exception an démarrage de l''enrobeur (wrapper) de la servlet {0}
+standardContext.startingWrapper=Exception an démarrage de l''enrobeur (wrapper) de la servlet [{0}]
 standardContext.stop.asyncWaitInterrupted=Une interruption a été reçue en attendant unloadDelay millisecondes pour permettre aux requêtes asynchrones en cours de se terminer, l'arrêt du contexte va se poursuivre sans délai supplémentaire
 standardContext.stoppingContext=Exception à l''arrêt du Context [{0}]
 standardContext.stoppingLoader=Exception à l''arrêt du "Loader"
 standardContext.stoppingManager=Exception à l''arrêt du "Manager"
-standardContext.stoppingWrapper=Exception à l''arrêt de l''enrobeur (wrapper) de la servlet {0}
-standardContext.urlDecode=Impossible de décoder le chemin de requête encodé dans l''URL {0}
+standardContext.stoppingWrapper=Exception à l''arrêt de l''enrobeur (wrapper) de la servlet [{0}]
+standardContext.urlDecode=Impossible de décoder le chemin de requête encodé dans l''URL [{0}]
 standardContext.urlPattern.patternWarning=WARNING: Le modèle (pattern) d''URL [{0}] doit commencer par un ''/'' dans l''API Servlet 2.4
-standardContext.urlValidate=Impossible de valider le chemin de requête encodé dans l''URL {0}
+standardContext.urlValidate=Impossible de valider le chemin de requête encodé dans l''URL [{0}]
 standardContext.workCreateException=Impossible de déterminer le chemin absolu pour le répertoire de travail à partir du répertoire [{0}] et de CATALINA_HOME [{1}] pour le contexte [{2}]
 standardContext.workCreateFail=Impossible de créer le répertoire de travail [{0}] pour le contexte [{1}]
 standardContext.workPath=Impossible d''obtenir le chemin de travail pour le contexte [{0}]
@@ -229,44 +229,44 @@ standardContextValve.acknowledgeException=Impossible de confirmer la requête av
 
 standardEngine.alreadyStarted=Le moteur a déjà été démarré
 standardEngine.jvmRouteFail=Impossible de fixer la jvmRoute de l'Engine à partir d'une propriété système
-standardEngine.mappingError=Erreur de configuration d''association (mapping configuration) pour le serveur {0}
+standardEngine.mappingError=Erreur de configuration d''association (mapping configuration) pour le serveur [{0}]
 standardEngine.noHost=Aucune hôte (host) ne correspond au nom de serveur [{0}]
 standardEngine.noHostHeader=requête HTTP/1.1 sans entête Host:
 standardEngine.notHost=Le fils d'un moteur (child of an Engine) doit être un hôte
 standardEngine.notParent=Un moteur (engine) ne peut avoir de conteneur parent (container)
 standardEngine.notStarted=Le moteur n''a pas encore été démarré
-standardEngine.unfoundHost=L''hôte virtuel (virtual host) {0} est introuvable
+standardEngine.unfoundHost=L''hôte virtuel (virtual host) [{0}] est introuvable
 standardEngine.unknownHost=Aucun serveur hôte n''est indiqué pour cette requête
 
-standardHost.accessBase=Impossible d''accéder le répertoire "document base" {0}
+standardHost.accessBase=Impossible d''accéder le répertoire "document base" [{0}]
 standardHost.alreadyStarted=L''hôte a déjà été démarré
-standardHost.appBase=Le répertoire de base de l''application {0} n''existe pas
+standardHost.appBase=Le répertoire de base de l''application [{0}] n''existe pas
 standardHost.clientAbort=Le client distant a abandonné la requête, IOException: [{0}]
 standardHost.configNotAllowed=L''utilisation d''un fichier de configuration n''est pas autorisée
 standardHost.configRequired=Une URL vers le fichier de configuration est obligatoire
-standardHost.docBase=Le répertoire "document base" {0} existe déjà
-standardHost.installError=Erreur lors du déploiement de l''application pour le chemin de contexte {0}
-standardHost.installing=Installation d''une application pour le chemin de contexte {0} depuis l''URL {1}
-standardHost.installingWAR=Installation d''une application depuis l''URL {0}
+standardHost.docBase=Le répertoire "document base" [{0}] existe déjà
+standardHost.installError=Erreur lors du déploiement de l''application pour le chemin de contexte [{0}]
+standardHost.installing=Installation d''une application pour le chemin de contexte [{0}] depuis l''URL [{1}]
+standardHost.installingWAR=Installation d''une application depuis l''URL [{0}]
 standardHost.invalidErrorReportValveClass=Impossible de charger la classe valve de rapport d''erreur: [{0}]
-standardHost.mappingError=Erreur d''association de configuration (mapping configuration) pour l''URI demandée {0}
+standardHost.mappingError=Erreur d''association de configuration (mapping configuration) pour l''URI demandée [{0}]
 standardHost.noContext=Aucun contexte n'est configuré pour traiter cette requête
 standardHost.noHost=Aucun hôte n''est configuré pour traiter cette requête
 standardHost.notContext=Le fils d'un hôte (child of a Host) doit être un contexte
 standardHost.notStarted=l''hôte n''a pas encore été démarré
 standardHost.nullName=Le nom d'hôte est requis
-standardHost.pathFormat=Chemin de contexte invalide: {0}
-standardHost.pathMissing=Le chemin de contexte {0} n''est pas utilisé actuellement
+standardHost.pathFormat=Chemin de contexte invalide: [{0}]
+standardHost.pathMissing=Le chemin de contexte [{0}] n''est pas utilisé actuellement
 standardHost.pathRequired=Le chemin de contexte est requis
-standardHost.pathUsed=Le chemin de contexte {0} est déjà utilisé
+standardHost.pathUsed=Le chemin de contexte [{0}] est déjà utilisé
 standardHost.problematicAppBase=Utiliser une chaîne vide pour l''appBase de l''hôte [{0}] la fera correspondre à CATALINA_BASE, ce qui causera des problèmes
-standardHost.removeError=Erreur lors du retrait de l''application web pour le chemin de contexte {0}
-standardHost.removing=Retrait de l''application web pour le chemin de contexte {0}
-standardHost.start=Démarrage de l''application web pour le chemin de contexte {0}
-standardHost.stop=Arrêt de l''application web pour le chemin de contexte {0}
-standardHost.unfoundContext=Impossible de trouver un contexte pour l''URI {0} demandée
+standardHost.removeError=Erreur lors du retrait de l''application web pour le chemin de contexte [{0}]
+standardHost.removing=Retrait de l''application web pour le chemin de contexte [{0}]
+standardHost.start=Démarrage de l''application web pour le chemin de contexte [{0}]
+standardHost.stop=Arrêt de l''application web pour le chemin de contexte [{0}]
+standardHost.unfoundContext=Impossible de trouver un contexte pour l''URI [{0}] demandée
 standardHost.warRequired=Une URL vers l''archive d''application web (war) est nécessaire
-standardHost.warURL=URL vers l''archive d''application web (war) invalide: {0}
+standardHost.warURL=URL vers l''archive d''application web (war) invalide: [{0}]
 
 standardHostValue.customStatusFailed=La page d''erreur personnalisée [{0}] n''a pu être redirigée correctement
 
@@ -278,8 +278,8 @@ standardService.stop.name=Arrêt du service [{0}]
 
 standardWrapper.allocate=Erreur d'allocation à une instance de servlet
 standardWrapper.allocateException=Exception lors de l''allocation pour la servlet [{0}]
-standardWrapper.containerServlet=Chargement du conteneur (container) de servlet {0}
-standardWrapper.createFilters=Exception à la création de filtres pour la servlet {0}
+standardWrapper.containerServlet=Chargement du conteneur (container) de servlet [{0}]
+standardWrapper.createFilters=Exception à la création de filtres pour la servlet [{0}]
 standardWrapper.deallocateException=Exception à la désallocation pour la servlet [{0}]
 standardWrapper.destroyException="Servlet.destroy()" de la servlet [{0}] a généré une exception
 standardWrapper.destroyInstance=InstanceManager.destroy() pour le Servlet [{0}] a renvoyé une exception
@@ -290,10 +290,10 @@ standardWrapper.exception3=Cause mère:
 standardWrapper.initException="Servlet.init()" pour la servlet [{0}] a généré une exception
 standardWrapper.instantiate=Erreur à l''instantiation de la classe servlet [{0}]
 standardWrapper.isUnavailable=La servlet [{0}] est actuellement indisponible
-standardWrapper.jasperLoader=Utilisation du chargeur de classe Jasper (classloader) pour la servlet {0}
-standardWrapper.jspFile.format=Le fichier JSP {0} ne commence par par un caractère ''/''
-standardWrapper.missingClass=L''enrobeur (wrapper) ne peut trouver la classe servlet {0} ou une classe dont elle dépend
-standardWrapper.missingLoader=L''enrobeur (wrapper) ne peut trouver de chargeur (loader) pour la servlet {0}
+standardWrapper.jasperLoader=Utilisation du chargeur de classe Jasper (classloader) pour la servlet [{0}]
+standardWrapper.jspFile.format=Le fichier JSP [{0}] ne commence par par un caractère ''/''
+standardWrapper.missingClass=L''enrobeur (wrapper) ne peut trouver la classe servlet [{0}] ou une classe dont elle dépend
+standardWrapper.missingLoader=L''enrobeur (wrapper) ne peut trouver de chargeur (loader) pour la servlet [{0}]
 standardWrapper.notChild=L'enrobeur de conteneur (wrapper container) ne peut pas avoir de conteneurs fils
 standardWrapper.notClass=Aucune classe servlet n''a été spécifiée pour la servlet [{0}]
 standardWrapper.notContext=Le conteneur parent d'un enrobeur (wrapper) doit être un contexte
@@ -302,8 +302,6 @@ standardWrapper.notServlet=La classe [{0}] n''est pas une servlet
 standardWrapper.releaseFilters=Exception des filtres de sortie (release filters) pour la servlet [{0}]
 standardWrapper.serviceException="Servlet.service()" pour la servlet [{0}] a généré une exception
 standardWrapper.serviceExceptionRoot=Servlet.service() du Servlet [{0}] dans le contexte au chemin [{1}] a retourné une exception [{2}] avec la cause
-standardWrapper.statusHeader=Etat HTTP {0} - {1}
-standardWrapper.statusTitle=Rapport d''erreur Tomcat
 standardWrapper.unavailable=La servlet [{0}] est marqué comme indisponible
 standardWrapper.unloadException=La servlet [{0}] a généré une exception "unload()"
 standardWrapper.unloading=Impossible d''allouer la servlet [{0}] car elle a été déchargée
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 9f15f23..6def22a 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -100,13 +100,13 @@ asyncContextImpl.request.ise=complete()の後、またはdispatch()メソッド
 asyncContextImpl.requestEnded=AsyncContextに関連付けられたリクエストは、すでに処理を完了しています。
 asyncContextImpl.response.ise=complete()、またはdispatch()メソッドのいずれかが呼び出された後での、不正なgetResponse()呼び出し。
 
-containerBase.alreadyStarted=コンテナ {0} は既に起動されています
+containerBase.alreadyStarted=コンテナ [{0}] は既に起動されています
 containerBase.backgroundProcess.cluster=クラスター [{0}] でバックグランド処理を実行中に例外が発生しました。
 containerBase.backgroundProcess.realm=Realm [{0}] のバックグラウンド処理中に例外が発生しました。
 containerBase.backgroundProcess.unexpectedThreadDeath=バックグラウンドスレッド [{0}] は予期せぬ理由で終了しました。
 containerBase.backgroundProcess.valve=Valve [{0}] のバックグラウンドプロセス処理中の例外
 containerBase.notConfigured=基本バルブが設定されていません
-containerBase.notStarted=コンテナ {0} はまだ起動されていません
+containerBase.notStarted=コンテナ [{0}] はまだ起動されていません
 containerBase.nullName=コンテナー名は null にできません。
 containerBase.threadedStartFailed=子コンテナーを開始できません。
 containerBase.threadedStopFailed=停止中に子コンテナが失敗しました。
@@ -144,7 +144,7 @@ standardContext.alreadyStarted=コンテキストは既に起動されていま
 standardContext.applicationListener=クラス [{0}] のアプリケーションリスナの設定中にエラーが発生しました
 standardContext.applicationSkipped=前のエラーのためにアプリケーションリスナのインストールをスキップします
 standardContext.backgroundProcess.instanceManager=インスタンスマネージャ[{0}]のバックグラウンドプロセス処理中の例外
-standardContext.badRequest=無効なリクエストパスです ({0})。
+standardContext.badRequest=無効なリクエストパスです [{0}]。
 standardContext.cluster.noManager=Managerが見つかりませんでした。 ClusterManagerを使用するかどうかの確認。 クラスタ構成:[{0}]、アプリケーション配布可能:[{1}]
 standardContext.configurationFail=コンテキストが正しく設定されていないとマークされた1つ以上のコンポーネント
 standardContext.duplicateListener=リスナー[{0}]は、すでにこのコンテキストに構成されています。 重複定義は無視されました。
@@ -172,11 +172,11 @@ standardContext.loginConfig.loginWarning=警告: Servlet 2.4ではフォーム
 standardContext.loginConfig.required=LoginConfigはnullではいけません
 standardContext.manager=クラス [{0}] をManagerとして構成しました。
 standardContext.managerFail=セッションマネージャーを開始できません。
-standardContext.mappingError=相対URI {0} のマッピング設定エラーです
+standardContext.mappingError=相対URI [{0}] のマッピング設定エラーです
 standardContext.namingResource.destroy.fail=以前の名前付きリソースを破棄できませんでした。
 standardContext.namingResource.init.fail=新しいネーミングリソースの初期化に失敗しました。
 standardContext.noResourceJar=リソースJARはサポートされていません。 [{0}]で見つかったJARは、名前[{1}]を持つコンテキストの静的コンテンツを提供するために使用されません。
-standardContext.notFound=リクエストされたリソース ({0}) は利用できません。
+standardContext.notFound=リクエストされたリソース [{0}] は利用できません。
 standardContext.notReloadable=このコンテキストでは再ロードは無効です
 standardContext.notStarted=コンテキストはまだ起動されていません
 standardContext.notWrapper=コンテキストの子供はラッパでなければいけません
@@ -190,10 +190,10 @@ standardContext.predestroy.required=完全修飾クラス名とメソッド名
 standardContext.reloadingCompleted=このコンテキストの再ロードが完了しました
 standardContext.reloadingFailed=以前のエラーのためにこのコンテキストの再ロードが失敗しました
 standardContext.reloadingStarted=このコンテキストの再ロードを開始しました
-standardContext.requestListener.requestDestroy=クラス {0} のリスナインスタンスに廃棄するライフサイクルイベントのリクエストを送信中の例外です
+standardContext.requestListener.requestDestroy=クラス [{0}] のリスナインスタンスに廃棄するライフサイクルイベントのリクエストを送信中の例外です
 standardContext.requestListener.requestInit=クラス [{0}] のリスナインスタンスに初期化するライフサイクルイベントのリクエストを送信中の例外です
 standardContext.requestListenerConfig.added=リクエストリスナバルブを追加しました
-standardContext.requestListenerConfig.error=リクエストリスナバルブ追加中の例外です: {0}
+standardContext.requestListenerConfig.error=リクエストリスナバルブ追加中の例外です: [{0}]
 standardContext.requestListenerStartFailed=リクエストリスナバルブの起動に失敗しました
 standardContext.resourcesInit=静的リソースの初期化エラー
 standardContext.resourcesStart=静的リソースの起動中のエラーです
@@ -209,15 +209,15 @@ standardContext.startFailed=以前のエラーのためにコンテキストの
 standardContext.startingContext=名前[{0}]のコンテキストを開始する際の例外
 standardContext.startingLoader=ローダを起動中の例外です
 standardContext.startingManager=マネージャを起動中の例外です
-standardContext.startingWrapper=サーブレット {0} のラッパを起動中の例外です
+standardContext.startingWrapper=サーブレット [{0}] のラッパを起動中の例外です
 standardContext.stop.asyncWaitInterrupted=実行中の非同期要求が完了するのをunloadDelayミリ秒待っている間に割り込みを受信しました。 コンテキスト停止はさらに遅れることなく続行されます。
 standardContext.stoppingContext=ローダを停止中の例外です
 standardContext.stoppingLoader=ローダを停止中の例外です
 standardContext.stoppingManager=マネージャを停止中の例外です
-standardContext.stoppingWrapper=サーブレット {0} のラッパを停止中の例外です
-standardContext.urlDecode=リクエストパス {0} のURLデコードができません
+standardContext.stoppingWrapper=サーブレット [{0}] のラッパを停止中の例外です
+standardContext.urlDecode=リクエストパス [{0}] のURLデコードができません
 standardContext.urlPattern.patternWarning=警告: Servlet 2.4ではURLパターン [{0}] は''/''で始まらなければいけません
-standardContext.urlValidate=URLデコードされたリクエストパス {0} を検証できません
+standardContext.urlValidate=URLデコードされたリクエストパス [{0}] を検証できません
 standardContext.workCreateException=コンテキスト[{2}]のディレクトリ[{0}]とCATALINA_HOME [{1}]からの絶対workディレクトリを特定できませんでした
 standardContext.workCreateFail=コンテキスト [{1}] の作業ディレクトリ [{0}] を作成できません。
 standardContext.workPath=コンテキスト[{0}]のworkパスを取得中の例外
@@ -226,47 +226,47 @@ standardContextValve.acknowledgeException=100 (Continue) レスポンスでリ
 
 standardEngine.alreadyStarted=エンジンは既に起動されています
 standardEngine.jvmRouteFail=EngineのjvmRoute属性をシステムプロパティから設定できませんでした
-standardEngine.mappingError=サーバ名 {0} のマッピング設定エラーです
+standardEngine.mappingError=サーバ名 [{0}] のマッピング設定エラーです
 standardEngine.noHost=サーバ名 [{0}] に一致するホストが存在しません
 standardEngine.noHostHeader=Host:ヘッダを持たない HTTP/1.1 リクエストです
 standardEngine.notHost=Engineの子供はHostでなければいけません
 standardEngine.notParent=エンジンは親のコンテナを持つことはできません
 standardEngine.notStarted=エンジンはまだ起動されていません
-standardEngine.unfoundHost=バーチャルホスト {0} が見つかりません
+standardEngine.unfoundHost=バーチャルホスト [{0}] が見つかりません
 standardEngine.unknownHost=このリクエスト中にサーバホストが指定されていません
 
-standardHost.accessBase=ドキュメントベースディレクトリ {0} にアクセスできません
+standardHost.accessBase=ドキュメントベースディレクトリ [{0}] にアクセスできません
 standardHost.alreadyStarted=ホストは既に起動されています
-standardHost.appBase=アプリケーションベースディレクトリ {0} が存在しません
+standardHost.appBase=アプリケーションベースディレクトリ [{0}] が存在しません
 standardHost.clientAbort=リモートクライアントがリクエストを中止しました, IOException: [{0}]
 standardHost.configNotAllowed=設定ファイルが使用できません
 standardHost.configRequired=設定ファイルへのURLが必要です
-standardHost.docBase=ドキュメントベースディレクトリ {0} が既に存在します
+standardHost.docBase=ドキュメントベースディレクトリ [{0}] が既に存在します
 standardHost.installBase=ホストWebアプリケーションディレクトリ中のWebアプリケーションだけがインストールできます
-standardHost.installError=コンテキストパス {0} にアプリケーションを配備中のエラーです
-standardHost.installing=URL {1} からコンテキストパス {0} にWebアプリケーションをインストールします
-standardHost.installingWAR=URL {0} からWebアプリケーションをインストールします
-standardHost.installingXML=コンテキスト設定ファイルのURL {0} を処理しています
+standardHost.installError=コンテキストパス [{0}] にアプリケーションを配備中のエラーです
+standardHost.installing=URL [{1}] からコンテキストパス [{0}] にWebアプリケーションをインストールします
+standardHost.installingWAR=URL [{0}] からWebアプリケーションをインストールします
+standardHost.installingXML=コンテキスト設定ファイルのURL [{0}] を処理しています
 standardHost.invalidErrorReportValveClass=指定されたErrorReportValveクラスをロードできません: [{0}]
-standardHost.mappingError=リクエストURI {0} のマッピング設定エラーです
+standardHost.mappingError=リクエストURI [{0}] のマッピング設定エラーです
 standardHost.noContext=このリクエストを処理するために設定されたコンテキストがありません
 standardHost.noHost=このリクエストを処理するために設定されたホストがありません
 standardHost.notContext=Host の子供はContextでなければいけません
 standardHost.notStarted=ホストがまだ起動されていません
 standardHost.nullName=ホスト名が必要です
-standardHost.pathFormat=無効なコンテキストパスです: {0}
-standardHost.pathMatch=コンテキストパス {0} はディレクトリ又はWARファイル名に一致しなければいけません: {1}
-standardHost.pathMissing=コンテキストパス {0} は現在使用されていません
+standardHost.pathFormat=無効なコンテキストパスです: [{0}]
+standardHost.pathMatch=コンテキストパス [{0}] はディレクトリ又はWARファイル名に一致しなければいけません: [{1}]
+standardHost.pathMissing=コンテキストパス [{0}] は現在使用されていません
 standardHost.pathRequired=コンテキストパスが必要です
-standardHost.pathUsed=コンテキストパス {0} は既に使用されています
+standardHost.pathUsed=コンテキストパス [{0}] は既に使用されています
 standardHost.problematicAppBase=ホスト[{0}]のappBaseに空の文字列を使用すると、CATALINA_BASEに設定されますが、これは悪い考えです。
-standardHost.removeError=コンテキストパス {0} のアプリケーションを削除中にエラーが発生しました
-standardHost.removing=コンテキストパス {0} のWebアプリケーションを削除します
-standardHost.start=コンテキストパス {0} のWebアプリケーションを起動します
-standardHost.stop=コンテキストパス {0} のWebアプリケーションを停止します
-standardHost.unfoundContext=リクエストURI {0} のコンテキストを見つけることができません
+standardHost.removeError=コンテキストパス [{0}] のアプリケーションを削除中にエラーが発生しました
+standardHost.removing=コンテキストパス [{0}] のWebアプリケーションを削除します
+standardHost.start=コンテキストパス [{0}] のWebアプリケーションを起動します
+standardHost.stop=コンテキストパス [{0}] のWebアプリケーションを停止します
+standardHost.unfoundContext=リクエストURI [{0}] のコンテキストを見つけることができません
 standardHost.warRequired=WebアプリケーションアーカイブのURLが必要です
-standardHost.warURL=Webアプリケーションアーカイブに対する無効なURLです: {0}
+standardHost.warURL=Webアプリケーションアーカイブに対する無効なURLです: [{0}]
 
 standardHostValue.customStatusFailed=カスタムエラーページ[{0}]を正しくディスパッチできませんでした。
 
@@ -278,8 +278,8 @@ standardService.stop.name=サービス [{0}] を停止します
 
 standardWrapper.allocate=サーブレットインスタンスを割り当て中のエラーです
 standardWrapper.allocateException=サーブレット [{0}] に例外を割り当てます
-standardWrapper.containerServlet=コンテナサーブレット {0} をロードします
-standardWrapper.createFilters=サーブレット {0}に対するフィルタ例外を作成します
+standardWrapper.containerServlet=コンテナサーブレット [{0}] をロードします
+standardWrapper.createFilters=サーブレット [{0}]に対するフィルタ例外を作成します
 standardWrapper.deallocateException=サーブレット [{0}] に対する例外の割り当てを解除します
 standardWrapper.destroyException=サーブレット [{0}] のServlet.destroy()が例外を投げました
 standardWrapper.destroyInstance=サーブレット [{0}] の InstanceManager.destroy() が例外を送出しました。
@@ -290,10 +290,10 @@ standardWrapper.exception3=根本の原因:
 standardWrapper.initException=サーブレット [{0}] のServlet.init()が例外を投げました
 standardWrapper.instantiate=サーブレットクラス [{0}] を初期化中にエラーが発生しました
 standardWrapper.isUnavailable=サーブレット [{0}] は現在利用できません
-standardWrapper.jasperLoader=サーブレット {0} にJasperクラスローダを使用します
-standardWrapper.jspFile.format=JSPファイル {0} が''/''文字で始まっていません
-standardWrapper.missingClass=ラッパがサーブレットクラス {0} 又はそれが依存するクラスを見つけることができません
-standardWrapper.missingLoader=ラッパがサーブレット {0} のローダを見つけることができません
+standardWrapper.jasperLoader=サーブレット [{0}] にJasperクラスローダを使用します
+standardWrapper.jspFile.format=JSPファイル [{0}] が''/''文字で始まっていません
+standardWrapper.missingClass=ラッパがサーブレットクラス [{0}] 又はそれが依存するクラスを見つけることができません
+standardWrapper.missingLoader=ラッパがサーブレット [{0}] のローダを見つけることができません
 standardWrapper.notChild=Wrapper コンテナは子供のコンテナを持つことはできません
 standardWrapper.notClass=サーブレット [{0}] に指定されたサーブレットクラスがありません
 standardWrapper.notContext=Wrapper の親のコンテナはContextでなければいけません
@@ -302,8 +302,6 @@ standardWrapper.notServlet=クラス [{0}] はServletではありません
 standardWrapper.releaseFilters=サーブレット [{0}] のフィルタ例外を解除します
 standardWrapper.serviceException=サーブレット [{0}] のServlet.service()が例外を投げました
 standardWrapper.serviceExceptionRoot=パス[{1}]を持つコンテキスト内のサーブレット[{0}]のServlet.service() が例外[{2}]が根本的要因と共に投げられました。
-standardWrapper.statusHeader=HTTPステータス {0} - {1}
-standardWrapper.statusTitle=Tomcatのエラーの報告
 standardWrapper.unavailable=サーブレット [{0}] を利用不可能にマークします
 standardWrapper.unloadException=サーブレット [{0}] がunload()例外を投げました
 standardWrapper.unloading=サーブレット [{0}] がロードされていないので、割り当てることができません
diff --git a/java/org/apache/catalina/deploy/LocalStrings.properties b/java/org/apache/catalina/deploy/LocalStrings.properties
index 22a0b69..b2e88c1 100644
--- a/java/org/apache/catalina/deploy/LocalStrings.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings.properties
@@ -58,4 +58,4 @@ webXml.multipleOther=Multiple others entries in ordering
 webXml.reservedName=A web.xml file was detected using a reserved name [{0}]. The name element will be ignored for this fragment.
 webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known public ID''s for web.xml files so the version could not be identified
 webXml.version.unknown=Unknown version string [{0}]. Default version will be used.
-webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml absolute-ordering tag!
+webXml.wrongFragmentName=Used a wrong fragment name [{0}] at web.xml absolute-ordering tag!
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings.properties b/java/org/apache/catalina/ha/tcp/LocalStrings.properties
index 18f36f8..f5cb55c 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings.properties
@@ -29,14 +29,6 @@ ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{1}] in
 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).
 
-SimpleTcpCluster.default.addClusterListener=Add Default ClusterListener at cluster {0}
-SimpleTcpCluster.default.addClusterReceiver=Add Default ClusterReceiver at cluster {0}
-SimpleTcpCluster.default.addClusterSender=Add Default ClusterSender at cluster {0}
-SimpleTcpCluster.default.addClusterValves=Add Default ClusterValves at cluster {0}
-SimpleTcpCluster.default.addMembershipService=Add Default Membership Service at cluster {0}
-SimpleTcpCluster.event.log=Cluster receive listener event {0} with data {1}
-SimpleTcpCluster.getProperty=get property {0}
-SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number} {2}:{3,number,integer} {4} {5}
-SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number} {2}:{3,number,integer} {4}
-SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
-SimpleTcpCluster.setProperty=set property {0}: {1} old value {2}
+SimpleTcpCluster.event.log=Cluster receive listener event [{0}] with data [{1}]
+SimpleTcpCluster.getProperty=get property [{0}]
+SimpleTcpCluster.setProperty=set property [{0}]: [{1}] old value [{2}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties b/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
index b7e1160..301e996 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
@@ -29,14 +29,6 @@ ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{0}] in
 ReplicationValve.session.invalid=Context [{0}]: Requested session [{1}] is invalid, removed or not replicated at this node.
 ReplicationValve.stats=Average request time= [{0}] ms for Cluster overhead time=[{1}] ms for [{2}] requests [{3}] filter requests [{4}] send requests [{5}] cross context requests (Request=[{6}] ms Cluster=[{7}] ms).
 
-SimpleTcpCluster.default.addClusterListener=Add Default ClusterListener at cluster {0}
-SimpleTcpCluster.default.addClusterReceiver=Add Default ClusterReceiver at cluster {0}
-SimpleTcpCluster.default.addClusterSender=Add Default ClusterSender at cluster {0}
-SimpleTcpCluster.default.addClusterValves=Add Default ClusterValves at cluster {0}
-SimpleTcpCluster.default.addMembershipService=Add Default Membership Service at cluster {0}
-SimpleTcpCluster.event.log=Cluster receive listener event {0} with data {1}
-SimpleTcpCluster.getProperty=get property {0}
-SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number} {2}:{3,number,integer} {4} {5}
-SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number} {2}:{3,number,integer} {4}
-SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
-SimpleTcpCluster.setProperty=set property {0}: {1} old value {2}
+SimpleTcpCluster.event.log=Cluster receive listener event [{0}] with data [{1}]
+SimpleTcpCluster.getProperty=get property [{0}]
+SimpleTcpCluster.setProperty=set property [{0}]: [{1}] old value [{2}]
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index a4bbe80..436a7ce 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileClassLoader.canRead=Repository {0} cannot be read
-fileClassLoader.exists=Repository {0} does not exist
-fileClassLoader.jarFile=Cannot read JAR file {0}
-fileClassLoader.restricted=Cannot load restricted class {0}
+fileClassLoader.canRead=Repository [{0}] cannot be read
+fileClassLoader.exists=Repository [{0}] does not exist
+fileClassLoader.jarFile=Cannot read JAR file [{0}]
+fileClassLoader.restricted=Cannot load restricted class [{0}]
 
-standardLoader.addRepository=Adding repository {0}
+standardLoader.addRepository=Adding repository [{0}]
 standardLoader.alreadyStarted=Loader has already been started
-standardLoader.checkInterval=Cannot set reload check interval to {0} seconds
+standardLoader.checkInterval=Cannot set reload check interval to [{0}] seconds
 standardLoader.notContext=Cannot auto-reload unless our Container is a Context
 standardLoader.notReloadabe=Reloadable property is set to false
 standardLoader.notStarted=Loader has not yet been started
-standardLoader.reloadable=Cannot set reloadable property to {0}
+standardLoader.reloadable=Cannot set reloadable property to [{0}]
 standardLoader.reloading=Reloading checks are enabled for this Context
-standardLoader.removeRepository=Removing repository {0}
+standardLoader.removeRepository=Removing repository [{0}]
 standardLoader.starting=Starting this Loader
 standardLoader.stopping=Stopping this Loader
 
@@ -78,21 +78,21 @@ webappClassLoader.wrongVersion=(unable to load class [{0}])
 
 webappClassLoaderParallel.registrationFailed=Registration of org.apache.catalina.loader.ParallelWebappClassLoader as capable of loading classes in parallel failed
 
-webappLoader.addRepository=Adding repository {0}
+webappLoader.addRepository=Adding repository [{0}]
 webappLoader.alreadyStarted=Loader has already been started
-webappLoader.checkInterval=Cannot set reload check interval to {0} seconds
+webappLoader.checkInterval=Cannot set reload check interval to [{0}] seconds
 webappLoader.classDeploy=Deploy class files [{0}] to [{1}]
 webappLoader.copyFailure=Failed to copy resources
 webappLoader.deploy=Deploying class repositories to work directory [{0}]
 webappLoader.failModifiedCheck=Error tracking modifications
 webappLoader.jarDeploy=Deploy JAR [{0}] to [{1}]
 webappLoader.mkdirFailure=Failed to create destination directory to copy resources
-webappLoader.namingFailure=Failed to access resource {0}
+webappLoader.namingFailure=Failed to access resource [{0}]
 webappLoader.notContext=Cannot auto-reload unless our Container is a Context
 webappLoader.notReloadabe=Reloadable property is set to false
 webappLoader.notStarted=Loader has not yet been started
 webappLoader.reloadable=Cannot set reloadable property to [{0}]
 webappLoader.reloading=Reloading checks are enabled for this Context
-webappLoader.removeRepository=Removing repository {0}
+webappLoader.removeRepository=Removing repository [{0}]
 webappLoader.starting=Starting this Loader
 webappLoader.stopping=Stopping this Loader
diff --git a/java/org/apache/catalina/loader/LocalStrings_es.properties b/java/org/apache/catalina/loader/LocalStrings_es.properties
index 844c422..28f8a90 100644
--- a/java/org/apache/catalina/loader/LocalStrings_es.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_es.properties
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileClassLoader.canRead=No se puede leer el Repositorio {0}
-fileClassLoader.exists=No existe el Repositorio {0}
-fileClassLoader.jarFile=No puedo leer archivo JAR {0}
-fileClassLoader.restricted=No puedo cargar clase restringida {0}
+fileClassLoader.canRead=No se puede leer el Repositorio [{0}]
+fileClassLoader.exists=No existe el Repositorio [{0}]
+fileClassLoader.jarFile=No puedo leer archivo JAR [{0}]
+fileClassLoader.restricted=No puedo cargar clase restringida [{0}]
 
-standardLoader.addRepository=Añadiendo repositorio {0}
+standardLoader.addRepository=Añadiendo repositorio [{0}]
 standardLoader.alreadyStarted=Ya ha sido arrancado el Cargador
-standardLoader.checkInterval=No puedo poner el intervalo de revisión de recarga a {0} segundos
+standardLoader.checkInterval=No puedo poner el intervalo de revisión de recarga a [{0}] segundos
 standardLoader.notContext=No puedo auto-recargar a menos que nuestro Contenedor sea un Contexto
 standardLoader.notReloadabe=La propiedad Recargable está puesta a falsa
 standardLoader.notStarted=Aún no se ha arrancado el Cargador
-standardLoader.reloadable=No puedo poner la propiedad recargable a {0}
+standardLoader.reloadable=No puedo poner la propiedad recargable a [{0}]
 standardLoader.reloading=Se han activado las revisiones de Recarga para este Contexto
-standardLoader.removeRepository=Quitando repositorio {0}
+standardLoader.removeRepository=Quitando repositorio [{0}]
 standardLoader.starting=Arrancando este Cargador
 standardLoader.stopping=Parando este Cargador
 
@@ -62,21 +62,21 @@ webappClassLoader.warnThread=La aplicación web [{0}] parece haber arrancado un
 webappClassLoader.warnTimerThread=La aplicación web [{0}] parece haber arrancado un TimerThread con nombre [{1}] vía de la API java.util.Timer, pero no ha podido pararlo. Para prevenir un fallo de memoria, el cronómetro (y el hilo asociado) hasido cancelado a la fuerza.
 webappClassLoader.wrongVersion=(no puedo cargar clase [{0}])
 
-webappLoader.addRepository=Añadiendo repositorio {0}
+webappLoader.addRepository=Añadiendo repositorio [{0}]
 webappLoader.alreadyStarted=Ya se ha arrancado el Cargador
-webappLoader.checkInterval=No puedo poner el intervalo de revisión de recarga a {0} segundos
+webappLoader.checkInterval=No puedo poner el intervalo de revisión de recarga a [{0}] segundos
 webappLoader.classDeploy=Despliegue de archivos de clase [{0}] en [{1}]
 webappLoader.copyFailure=No pude copiar los recursos
 webappLoader.deploy=Desplegando repositorios de clase en directorio de trabajo [{0}]
 webappLoader.failModifiedCheck=Modificaciones de pista de error
 webappLoader.jarDeploy=Despliegue del JAR [{0}] en [{1}]
 webappLoader.mkdirFailure=No pude crear directorio de destino para copiar los recursos
-webappLoader.namingFailure=No pude acceder al recurso {0}
+webappLoader.namingFailure=No pude acceder al recurso [{0}]
 webappLoader.notContext=No puedo auto-recargar a menos que nuestro Contenedor sea un Contexto
 webappLoader.notReloadabe=Se ha puesto la propiedad Recargable a falsa
 webappLoader.notStarted=Aún no se ha arrancado el Cargador
 webappLoader.reloadable=No puedo poner la propiedad recargable a [{0}]
 webappLoader.reloading=Se han activado los chequeos de Recarga para este Contexto
-webappLoader.removeRepository=Quitando repositorio {0}
+webappLoader.removeRepository=Quitando repositorio [{0}]
 webappLoader.starting=Arrancando este Cargador
 webappLoader.stopping=Parando este Cargador
diff --git a/java/org/apache/catalina/loader/LocalStrings_fr.properties b/java/org/apache/catalina/loader/LocalStrings_fr.properties
index b2a7397..f95e12c 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileClassLoader.canRead=Le réceptacle (repository) {0} ne peut être lu
-fileClassLoader.exists=Le réceptacle (repository) {0} n''existe pas
-fileClassLoader.jarFile=Impossible de lire le fichier JAR {0}
-fileClassLoader.restricted=Impossible de charger la classe restreinte (restricted class) {0}
+fileClassLoader.canRead=Le réceptacle (repository) [{0}] ne peut être lu
+fileClassLoader.exists=Le réceptacle (repository) [{0}] n''existe pas
+fileClassLoader.jarFile=Impossible de lire le fichier JAR [{0}]
+fileClassLoader.restricted=Impossible de charger la classe restreinte (restricted class) [{0}]
 
-standardLoader.addRepository=Ajout du réceptacle (repository) {0}
+standardLoader.addRepository=Ajout du réceptacle (repository) [{0}]
 standardLoader.alreadyStarted=Le chargeur (loader) a déjà été démarré
-standardLoader.checkInterval=Impossible de régler l''interval de vérification de rechargement à {0} secondes
+standardLoader.checkInterval=Impossible de régler l''interval de vérification de rechargement à [{0}] secondes
 standardLoader.notContext=Impossible d''auto-recharger sans que le conteneur ne soit un contexte
 standardLoader.notReloadabe=Propriété de rechargement (reloadable property) mise à faux
 standardLoader.notStarted=Le chargeur (loader) n''a pas encore été démarré
-standardLoader.reloadable=Impossible de mettre la propriété de rechargement (reloadable property) à {0}
+standardLoader.reloadable=Impossible de mettre la propriété de rechargement (reloadable property) à [{0}]
 standardLoader.reloading=Les vérifications de rechargement sont activées pour ce contexte
-standardLoader.removeRepository=Retrait du réceptacle (repository) {0}
+standardLoader.removeRepository=Retrait du réceptacle (repository) [{0}]
 standardLoader.starting=Démarrage de ce chargeur (loader)
 standardLoader.stopping=Arrêt de ce chargeur (loader)
 
@@ -67,9 +67,9 @@ webappClassLoader.wrongVersion=(impossible de charger la classe [{0}])
 
 webappClassLoaderParallel.registrationFailed=L'enregistrement de org.apache.catalina.loader.ParallelWebappClassLoader comme pouvant charger des classes en parallèle a échoué
 
-webappLoader.addRepository=Ajout du réceptacle (repository) {0}
+webappLoader.addRepository=Ajout du réceptacle (repository) [{0}]
 webappLoader.alreadyStarted=Le chargeur (loader) a déjà été démarré
-webappLoader.checkInterval=Impossible de régler l''interval de vérification de rechargement à {0} secondes
+webappLoader.checkInterval=Impossible de régler l''interval de vérification de rechargement à [{0}] secondes
 webappLoader.classDeploy=Déploiement des fichiers classes [{0}] vers [{1}]
 webappLoader.copyFailure=Echec lors de la copie des ressources
 webappLoader.deploy=Déploiement des classes des réceptacles (class repositories) vers le répertoire de travail [{0}]
@@ -81,6 +81,6 @@ webappLoader.notReloadabe=Propriété de rechargement (reloadable property) mise
 webappLoader.notStarted=Le chargeur (loader) n''a pas encore été démarré
 webappLoader.reloadable=Impossible de mettre la propriété rechargeable à [{0}]
 webappLoader.reloading=Les vérifications de rechargement sont activées pour ce contexte
-webappLoader.removeRepository=Retrait du réceptacle (repository) {0}
+webappLoader.removeRepository=Retrait du réceptacle (repository) [{0}]
 webappLoader.starting=Démarrage de ce chargeur (loader)
 webappLoader.stopping=Arrêt de ce chargeur (loader)
diff --git a/java/org/apache/catalina/loader/LocalStrings_ja.properties b/java/org/apache/catalina/loader/LocalStrings_ja.properties
index a62b55b..806cbfe 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ja.properties
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileClassLoader.canRead=リポジトリ {0} が読めません
-fileClassLoader.exists=リポジトリ {0} が存在しません
-fileClassLoader.jarFile=JARファイル {0} が読めません
-fileClassLoader.restricted=制限されたクラス {0} をロードできません
+fileClassLoader.canRead=リポジトリ [{0}] が読めません
+fileClassLoader.exists=リポジトリ [{0}] が存在しません
+fileClassLoader.jarFile=JARファイル [{0}] が読めません
+fileClassLoader.restricted=制限されたクラス [{0}] をロードできません
 
-standardLoader.addRepository=リポジトリ {0} を追加します
+standardLoader.addRepository=リポジトリ [{0}] を追加します
 standardLoader.alreadyStarted=ローダは既に起動されています
-standardLoader.checkInterval=再ロードチェック間隔を{0}秒に設定できません
+standardLoader.checkInterval=再ロードチェック間隔を[{0}]秒に設定できません
 standardLoader.notContext=このコンテナがコンテキストでなければ、自動再ロードはできません
 standardLoader.notReloadabe=reloadableプロパティがfalseに設定されています
 standardLoader.notStarted=ローダはまだ起動されていません
-standardLoader.reloadable=reloadableプロパティを {0} に設定できません
+standardLoader.reloadable=reloadableプロパティを [{0}] に設定できません
 standardLoader.reloading=このコンテキストの再ロードチェックは有効です
-standardLoader.removeRepository=リポジトリ {0} を削除します
+standardLoader.removeRepository=リポジトリ [{0}] を削除します
 standardLoader.starting=このローダを起動します
 standardLoader.stopping=このローダを停止します
 
@@ -67,9 +67,9 @@ webappClassLoader.wrongVersion=(クラス[{0}]をロードできません)
 
 webappClassLoaderParallel.registrationFailed=並列にクラスをロードできるorg.apache.catalina.loader.ParallelWebappClassLoaderの登録に失敗しました。
 
-webappLoader.addRepository=リポジトリ {0} を追加します
+webappLoader.addRepository=リポジトリ [{0}] を追加します
 webappLoader.alreadyStarted=ローダは既に起動されています
-webappLoader.checkInterval=再ロードチェック間隔を{0}秒に設定できません
+webappLoader.checkInterval=再ロードチェック間隔を[{0}]秒に設定できません
 webappLoader.classDeploy=クラスファイル [{0}] を [{1}] に配備します
 webappLoader.copyFailure=リソースをコピーできません。
 webappLoader.deploy=クラスリポジトリを作業ディレクトリ [{0}] に配備します
@@ -81,6 +81,6 @@ webappLoader.notReloadabe=reloadableプロパティがfalseに設定されてい
 webappLoader.notStarted=ローダはまだ起動されていません
 webappLoader.reloadable=reloadableプロパティを [{0}] に設定できません
 webappLoader.reloading=このコンテキストの再ロードチェックは有効です
-webappLoader.removeRepository=リポジトリ {0} を削除します
+webappLoader.removeRepository=リポジトリ [{0}] を削除します
 webappLoader.starting=このローダを起動します
 webappLoader.stopping=このローダを停止します
diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties
index d561f50..bdb9bd5 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -104,8 +104,8 @@ htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
 
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
-managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
-managerServlet.configured=OK - Deployed application from context file {0}
+managerServlet.alreadyDocBase=FAIL - Directory [{0}] is already in use
+managerServlet.configured=OK - Deployed application from context file [{0}]
 managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued presence of this file may cause problems.
 managerServlet.deployFailed=FAIL - Failed to deploy application at context path [{0}]
 managerServlet.deployed=OK - Deployed application at context path [{0}]
@@ -117,20 +117,20 @@ managerServlet.findleaksNone=OK - No memory leaks found
 managerServlet.inService=FAIL - The application [{0}] is already being serviced
 managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command [{0}]
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
-managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
+managerServlet.invalidWar=FAIL - Invalid application URL [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
 managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
-managerServlet.noAppBase=FAIL - Cannot identify application base for context path {0}
+managerServlet.noAppBase=FAIL - Cannot identify application base for context path [{0}]
 managerServlet.noCommand=FAIL - No command was specified
 managerServlet.noContext=FAIL - No context exists named [{0}]
-managerServlet.noDirectory=FAIL - Non-directory document base for path {0}
-managerServlet.noDocBase=FAIL - Cannot undeploy document base for path {0}
+managerServlet.noDirectory=FAIL - Non-directory document base for path [{0}]
+managerServlet.noDocBase=FAIL - Cannot undeploy document base for path [{0}]
 managerServlet.noGlobal=FAIL - No global JNDI resources are available
 managerServlet.noManager=FAIL - No manager exists for path [{0}]
-managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0}
-managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
-managerServlet.noRole=FAIL - User does not possess role {0}
+managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path [{0}]
+managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path [{0}]
+managerServlet.noRole=FAIL - User does not possess role [{0}]
 managerServlet.noSelf=FAIL - The manager cannot reload, undeploy, stop, or undeploy itself
 managerServlet.noWrapper=Container has not called setWrapper() for this servlet
 managerServlet.notDeployed=FAIL - Context [{0}] is defined in server.xml and may not be undeployed
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties b/java/org/apache/catalina/manager/LocalStrings_de.properties
index fc35c6a..c93da49 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-htmlManagerServlet.appsAvailable=Verfügbar
+htmlManagerServlet.appsAvailable=gestartet
 htmlManagerServlet.appsExpire=Lösche Sitzungen
 htmlManagerServlet.appsName=Anzeigename
 htmlManagerServlet.appsPath=Kontext Pfad
@@ -24,17 +24,20 @@ htmlManagerServlet.appsStop=Stop
 htmlManagerServlet.appsTasks=Kommandos
 htmlManagerServlet.appsTitle=Anwendungen
 htmlManagerServlet.appsUndeploy=Entfernen
+htmlManagerServlet.connectorStateProcessingTime=Verarbeitungszeit:
+htmlManagerServlet.connectorStateTableTitleRequest=Anfrage
+htmlManagerServlet.connectorStateTableTitleVHost=VHost
 htmlManagerServlet.deployButton=Installieren
 htmlManagerServlet.deployConfig=XML Konfigurationsdatei URL:
 htmlManagerServlet.deployPath=Kontext Pfad (optional):
 htmlManagerServlet.deployServer=Verzeichnis oder WAR Datei auf Server installieren
 htmlManagerServlet.deployTitle=Installieren
 htmlManagerServlet.deployUpload=Lokale WAR Datei zur Installation hochladen
-htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation fehlgeschlagen, Ausnahme: {0}
+htmlManagerServlet.deployUploadFail=FEHLER - Hochladen zur Installation fehlgeschlagen, Ausnahme: [{0}]
 htmlManagerServlet.deployUploadFile=WAR Datei auswählen
 htmlManagerServlet.deployUploadNoFile=FEHLER - Hochladen fehlgeschlagen, keine Datei vorhanden
-htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei "{0}" muss ein .war sein
-htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei "{0}" existiert bereits auf Server
+htmlManagerServlet.deployUploadNotWar=FEHLER - Hochgeladene Datei [{0}] muss ein .war sein
+htmlManagerServlet.deployUploadWarExists=FEHLER - WAR Datei [{0}] existiert bereits auf Server
 htmlManagerServlet.deployWar=WAR oder Verzeichnis URL:
 htmlManagerServlet.expire.explain=mit Inaktivität &ge;
 htmlManagerServlet.expire.unit=Minuten
@@ -42,9 +45,14 @@ htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch)
 htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
 htmlManagerServlet.helpManager=Hilfeseite Manager (englisch)
 htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.jvmFreeMemory=Freier Speicher:
+htmlManagerServlet.jvmTableTitleMaximum=Maximum
+htmlManagerServlet.jvmTableTitleType=Typ
 htmlManagerServlet.list=Anwendungen auflisten
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Nachricht:
+htmlManagerServlet.noManager=-
+htmlManagerServlet.serverIPAddress=IP-Adresse
 htmlManagerServlet.serverJVMVendor=JVM Hersteller
 htmlManagerServlet.serverJVMVersion=JVM Version
 htmlManagerServlet.serverOSArch=OS Architektur
@@ -54,40 +62,41 @@ htmlManagerServlet.serverTitle=Server Informationen
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Webanwendungs-Manager
 
-managerServlet.alreadyContext=FEHLER - Anwendung existiert bereits für Kontext Pfad {0}
-managerServlet.alreadyDocBase=FEHLER - Verzeichnis {0} bereits in Benutzung
-managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert
-managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
-managerServlet.exception=FEHLER - Ausnahme aufgetreten {0}
-managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad {0} angegeben
-managerServlet.invalidWar=FEHLER - Ungültige URL {0} für Anwendung angegeben
-managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server {0}
+managerServlet.alreadyContext=FEHLER - Anwendung existiert bereits für Kontext Pfad [{0}]
+managerServlet.alreadyDocBase=FEHLER - Verzeichnis [{0}] bereits in Benutzung
+managerServlet.configured=OK - Anwendung von Kontext-Datei [{0}] installiert
+managerServlet.deployed=OK - Anwendung mit Kontext Pfad [{0}] installiert
+managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
+managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
+managerServlet.invalidWar=FEHLER - Ungültige URL [{0}] für Anwendung angegeben
+managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server [{0}]
 managerServlet.listitem={0}:{1}:{2}:{3}
-managerServlet.noAppBase=FEHLER - Kann Verzeichnis für Kontext Pfad {0} nicht finden
+managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt werden.
+managerServlet.noAppBase=FEHLER - Kann Verzeichnis für Kontext Pfad [{0}] nicht finden
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
-managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad {0}
-managerServlet.noDirectory=FEHLER - Pfad {0} ist kein Verzeichnis
-managerServlet.noDocBase=FEHLER - Kann Webanwendungs-Verzeichnis nicht entfernen für Kontext Pfad {0}
+managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad [{0}]
+managerServlet.noDirectory=FEHLER - Pfad [{0}] ist kein Verzeichnis
+managerServlet.noDocBase=FEHLER - Kann Webanwendungs-Verzeichnis nicht entfernen für Kontext Pfad [{0}]
 managerServlet.noGlobal=FEHLER - Keine globalen JNDI Ressourcen verfügbar
-managerServlet.noReload=FEHLER - Neu laden nicht unterstützt für WAR mit Pfad {0}
-managerServlet.noRename=FEHLER - Kann hochgeladenes WAR mit Pfad {0} nicht installieren
-managerServlet.noRole=FEHLER - Benutzer nicht in Rolle {0}
+managerServlet.noReload=FEHLER - Neu laden nicht unterstützt für WAR mit Pfad [{0}]
+managerServlet.noRename=FEHLER - Kann hochgeladenes WAR mit Pfad [{0}] nicht installieren
+managerServlet.noRole=FEHLER - Benutzer nicht in Rolle [{0}]
 managerServlet.noSelf=FEHLER - Manager-Kommandos können nicht auf die Manager-Anwendung selbst angewendet werden
 managerServlet.noWrapper=Container hat setWrapper() für dieses Servlet nicht aufgerufen
-managerServlet.reloaded=OK - Anwendung mit Kontext Pfad {0} neu geladen
+managerServlet.reloaded=OK - Anwendung mit Kontext Pfad [{0}] neu geladen
 managerServlet.resourcesAll=OK - Auflistung globaler Ressourcen (alle Typen)
-managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ {0}
-managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: {0}
-managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal {0} Minuten Inaktivität
-managerServlet.sessions=OK - Sitzungs-Informationen für Anwendung mit Kontext Pfad {0}
-managerServlet.sessiontimeout={0} Minuten: {1} Sitzungen
-managerServlet.sessiontimeout.expired={0} Minuten: expired {1} Sitzungen
-managerServlet.sessiontimeout.unlimited=unlimited Minuten: {0} Sitzungen
-managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad {0} konnte nicht gestartet werden
-managerServlet.started=OK - Anwendung mit Kontext Pfad {0} gestartet
-managerServlet.stopped=OK - Anwendung mit Kontext Pfad {0} gestoppt
-managerServlet.undeployed=OK - Anwendung mit Kontext Pfad {0} entfernt
-managerServlet.unknownCommand=FEHLER - Unbekanntes Kommando {0}
+managerServlet.resourcesType=OK - Auflistung globaler Ressourcen von Typ [{0}]
+managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: [{0}]
+managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal [{0}] Minuten Inaktivität
+managerServlet.sessions=OK - Sitzungs-Informationen für Anwendung mit Kontext Pfad [{0}]
+managerServlet.sessiontimeout=Inaktiv für [{0}] Minuten: [{1}] Sitzungen
+managerServlet.sessiontimeout.expired=Inaktiv für [{0}] Minuten: [{1}] Sitzungen sind abgelaufen
+managerServlet.sessiontimeout.unlimited=unlimited Minuten: [{0}] Sitzungen
+managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad [{0}] konnte nicht gestartet werden
+managerServlet.started=OK - Anwendung mit Kontext Pfad [{0}] gestartet
+managerServlet.stopped=OK - Anwendung mit Kontext Pfad [{0}] gestoppt
+managerServlet.undeployed=OK - Anwendung mit Kontext Pfad [{0}] entfernt
+managerServlet.unknownCommand=FEHLER - Unbekanntes Kommando [{0}]
 managerServlet.userDatabaseError=FEHLER - Kann Referenz auf Benutzerdatendank nicht auflösen
 managerServlet.userDatabaseMissing=FEHLER - Keine Benutzerdatenbank vorhanden
 
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 146cc89..389b530 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -73,8 +73,8 @@ htmlManagerServlet.serverVersion=Versión de Tomcat
 htmlManagerServlet.title=Gestor de Aplicaciones Web de Tomcat
 
 managerServlet.alreadyContext=FALLO - Ya existe la aplicación en la trayectoria [{0}]
-managerServlet.alreadyDocBase=FALLO - Directorio {0} ya está siendo usado
-managerServlet.configured=OK - Desplegada aplicación desde archivo de contexto {0}
+managerServlet.alreadyDocBase=FALLO - Directorio [{0}] ya está siendo usado
+managerServlet.configured=OK - Desplegada aplicación desde archivo de contexto [{0}]
 managerServlet.deleteFail=FALLO - No pude borrar [{0}]. La presencia continua de este fichero puede causar problemas.
 managerServlet.deployFailed=FALLO - No pude desplegar la aplicación en ruta de contexto [{0}]
 managerServlet.deployed=OK - Desplegada aplicación en trayectoria de contexto [{0}]
@@ -85,20 +85,20 @@ managerServlet.findleaksList=OK - Hallados fallos potenciales de memoria en las
 managerServlet.findleaksNone=OK - No se han hallado fallos de memoria
 managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para el comando [{0}]
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida de contexto [{0}]
-managerServlet.invalidWar=FALLO - Se ha especificado una URL de aplicación inválida {0}
+managerServlet.invalidWar=FALLO - Se ha especificado una URL de aplicación inválida [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
 managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
-managerServlet.noAppBase=FALLO - No puedo identificar aplicación base para trayectoria de contexto {0}
+managerServlet.noAppBase=FALLO - No puedo identificar aplicación base para trayectoria de contexto [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
 managerServlet.noContext=FALLO - No existe contexto para trayectoria [{0}]
-managerServlet.noDirectory=FALLO - Documento base No-directorio para trayectoria {0}
-managerServlet.noDocBase=FALLO - No puedo replegar documento base para trayectoria {0}
+managerServlet.noDirectory=FALLO - Documento base No-directorio para trayectoria [{0}]
+managerServlet.noDocBase=FALLO - No puedo replegar documento base para trayectoria [{0}]
 managerServlet.noGlobal=FALLO - No hay disponibles recursos globales JNDI
 managerServlet.noManager=FALLO - No existe gestor para ruta [{0}]
-managerServlet.noReload=FALLO - Recarga no soportada en WAR desplegado en trayectoria {0}
-managerServlet.noRename=FALLO - No pudeo desplegar WAR cargado para trayectoria {0}
-managerServlet.noRole=FALLO - El usuario no desempeña el papel de {0}
+managerServlet.noReload=FALLO - Recarga no soportada en WAR desplegado en trayectoria [{0}]
+managerServlet.noRename=FALLO - No pudeo desplegar WAR cargado para trayectoria [{0}]
+managerServlet.noRole=FALLO - El usuario no desempeña el papel de [{0}]
 managerServlet.noSelf=FALLO - El gestor no puede recargarse, replegarse, pararse o replegarse a sí mismo
 managerServlet.noWrapper=El Contenedor no ha llamado a setWrapper() para este servlet
 managerServlet.notDeployed=FALLO - El contexto [{0}] está definido en server.xml y puede que no esté desplegado
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 6ff325d..8a99c05 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -102,8 +102,8 @@ htmlManagerServlet.serverVersion=Version de serveur
 htmlManagerServlet.title=Gestionnaire d'applications WEB Tomcat
 
 managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le chemin [{0}]
-managerServlet.alreadyDocBase=ECHEC - Le répertoire {0} est déjà utilisé
-managerServlet.configured=OK - Application configurée depuis le fichier contexte {0}
+managerServlet.alreadyDocBase=ECHEC - Le répertoire [{0}] est déjà utilisé
+managerServlet.configured=OK - Application configurée depuis le fichier contexte [{0}]
 managerServlet.deleteFail=ECHEC - Impossible de supprimer [{0}], ce qui pourrait causer des problèmes
 managerServlet.deployFailed=ECHEC - Echec au déploiement de l''application pour le chemin de contexte [{0}]
 managerServlet.deployed=OK - Application déployée pour le chemin de contexte [{0}]
@@ -115,20 +115,20 @@ managerServlet.findleaksNone=OK - Aucune fuite de mémoire trouvée
 managerServlet.inService=ECHEC - Une opération de gestion est déjà en cours pour l''application [{0}]
 managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été fournis pour la commande [{0}]
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été spécifié
-managerServlet.invalidWar=ECHEC - Une URL d''application invalide {0} a été spécifiée
+managerServlet.invalidWar=ECHEC - Une URL d''application invalide [{0}] a été spécifiée
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual host) [{0}]
 managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
-managerServlet.noAppBase=ECHEC - Impossible d''identifier la base de l''application base pour le chemin de contexte {0}
+managerServlet.noAppBase=ECHEC - Impossible d''identifier la base de l''application base pour le chemin de contexte [{0}]
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
-managerServlet.noDirectory=ECHEC - La base de document n''est pas un répertoire pour le chemin {0}
-managerServlet.noDocBase=ECHEC - Impossible de retirer la base de document pour le chemin {0}
+managerServlet.noDirectory=ECHEC - La base de document n''est pas un répertoire pour le chemin [{0}]
+managerServlet.noDocBase=ECHEC - Impossible de retirer la base de document pour le chemin [{0}]
 managerServlet.noGlobal=ECHEC - Aucune ressource JNDI globale n'est disponible
 managerServlet.noManager=ECHEC - Aucun gestionnaire n''existe pour le chemin [{0}]
-managerServlet.noReload=ECHEC - Rechargement non supporté par le WAR déployé au chemin {0}
-managerServlet.noRename=ECHEC - Impossible de déployer un WAR téléchargé pour le chemin {0}
-managerServlet.noRole=ECHEC - L''utilisateur ne possède pas le rôle {0}
+managerServlet.noReload=ECHEC - Rechargement non supporté par le WAR déployé au chemin [{0}]
+managerServlet.noRename=ECHEC - Impossible de déployer un WAR téléchargé pour le chemin [{0}]
+managerServlet.noRole=ECHEC - L''utilisateur ne possède pas le rôle [{0}]
 managerServlet.noSelf=ECHEC - Le gestionnaire ne peut se recharger, se retirer, s'arrêter, ou se déployer lui-même
 managerServlet.noWrapper=Le conteneur n'a pas appelé "setWrapper()" pour cette servlet
 managerServlet.notDeployed=ECHEC - Le contexte [{0}] est défini dans server.xml et ne peut être retiré
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 330a0b4..cedb47e 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -104,9 +104,9 @@ htmlManagerServlet.serverVersion=Tomcatバージョン
 htmlManagerServlet.title=Tomcat Webアプリケーションマネージャ
 
 managerServlet.alreadyContext=FAIL - アプリケーションは、既にパス [{0}] に存在します
-managerServlet.alreadyDocBase=FAIL - ディレクトリ {0} は既に使用されています
+managerServlet.alreadyDocBase=FAIL - ディレクトリ [{0}] は既に使用されています
 managerServlet.cannotInvoke=インボーカでマネージャサーブレットを起動できませんでした
-managerServlet.configured=OK - コンテキストファイル {0} からアプリケーションをインストールしました
+managerServlet.configured=OK - コンテキストファイル [{0}] からアプリケーションをインストールしました
 managerServlet.deleteFail=FAIL  -  [{0}]を削除できません。 このファイルが継続して存在すると、問題が発生する可能性があります。
 managerServlet.deployFailed=FAIL - コンテキストパス [{0}] にアプリケーションを配備できません。
 managerServlet.deployed=OK - コンテキストパス [{0}] でアプリケーションを配備しました
@@ -118,20 +118,20 @@ managerServlet.findleaksNone=OK - メモリリークは見つかりません
 managerServlet.inService=FAIL - アプリケーション [{0}] はすでにサービスを開始しています。
 managerServlet.invalidCommand=FAIL  - コマンド[{0}]に無効なパラメータが指定されました
 managerServlet.invalidPath=FAIL - 無効なコンテキストパス [{0}] が指定されました
-managerServlet.invalidWar=FAIL - 無効なアプリケーションのURL {0} が指定されました
+managerServlet.invalidWar=FAIL - 無効なアプリケーションのURL [{0}] が指定されました
 managerServlet.listed=OK - バーチャルホスト [{0}] のアプリケーション一覧です
 managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - ディレクトリ [{0}] は作成できません。
-managerServlet.noAppBase=FAIL - コンテキストパス {0} に対してアプリケーションベースを確認できません
+managerServlet.noAppBase=FAIL - コンテキストパス [{0}] に対してアプリケーションベースを確認できません
 managerServlet.noCommand=FAIL - コマンドが指定されていません
 managerServlet.noContext=FAIL - パス [{0}] のコンテキストが存在しません
-managerServlet.noDirectory=FAIL - パス {0} に対するディレクトリドキュメントベースがありません
-managerServlet.noDocBase=FAIL - パス {0} に対するドキュメントベースを削除できません
+managerServlet.noDirectory=FAIL - パス [{0}] に対するディレクトリドキュメントベースがありません
+managerServlet.noDocBase=FAIL - パス [{0}] に対するドキュメントベースを削除できません
 managerServlet.noGlobal=FAIL - グローバルなJNDIリソースが利用できません
 managerServlet.noManager=FAIL  - パス[{0}]のマネージャが存在しません
-managerServlet.noReload=FAIL - パス {0} に配備されたWARファイルでは再ロードがサポートされていません
-managerServlet.noRename=FAIL - アップロードされたWARファイルをパス {0} に配備できません
-managerServlet.noRole=FAIL - ユーザはロール {0} を持っていません
+managerServlet.noReload=FAIL - パス [{0}] に配備されたWARファイルでは再ロードがサポートされていません
+managerServlet.noRename=FAIL - アップロードされたWARファイルをパス [{0}] に配備できません
+managerServlet.noRole=FAIL - ユーザはロール [{0}] を持っていません
 managerServlet.noSelf=FAIL - マネージャ自身を再ロード、削除、停止、又は配備解除できません
 managerServlet.noWrapper=コンテナはこのサーブレットに対して呼び出されたsetWrapper()を持っていません
 managerServlet.notDeployed=FAIL  - Context[{0}]はserver.xmlで定義されており、展開されていない可能性があります。
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index af7fbff..8925f2a 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -31,29 +31,29 @@ dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
 dataSourceRealm.getRoles.exception=Exception retrieving roles for [{0}]
 dataSourceRealm.open=Exception opening database connection
 
-jaasCallback.digestpassword=Digested password "{0}" as "{1}"
-jaasCallback.password=Returned password "{0}"
+jaasCallback.digestpassword=Digested password [{0}] as [{1}]
+jaasCallback.password=Returned password [{0}]
 jaasCallback.username=Returned username [{0}]
 
 jaasRealm.accountExpired=Username [{0}] NOT authenticated due to expired account
 jaasRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 jaasRealm.authenticateSuccess=Username [{0}] successfully authenticated as Principal [{1}] -- Subject was created too
 jaasRealm.beginLogin=JAASRealm login requested for username [{0}] using LoginContext for application [{1}]
-jaasRealm.cachePrincipal=User Principal "{0}" cached; has {1} role Principal(s)
+jaasRealm.cachePrincipal=User Principal [{0}] cached; has [{1}] role Principal(s)
 jaasRealm.checkPrincipal=Checking Principal [{0}] [{1}]
 jaasRealm.credentialExpired=Username [{0}] NOT authenticated due to expired credential
 jaasRealm.failedLogin=Username [{0}] NOT authenticated due to failed login
 jaasRealm.isInRole.match=Matching role Principal found.
 jaasRealm.isInRole.noMatch=Matching role Principal NOT found.
 jaasRealm.isInRole.noPrincipalOrRole=No roles Principals found. User Principal or Subject is null, or user Principal not in cache
-jaasRealm.isInRole.possessesRole=User Principal has a role Principal called "{0}"
-jaasRealm.isInRole.principalCached=User Principal has {0} role Principal(s)
-jaasRealm.isInRole.start=Checking if user Principal "{0}" possesses role "{1}"
+jaasRealm.isInRole.possessesRole=User Principal has a role Principal called [{0}]
+jaasRealm.isInRole.principalCached=User Principal has [{0}] role Principal(s)
+jaasRealm.isInRole.start=Checking if user Principal [{0}] possesses role [{1}]
 jaasRealm.loginContextCreated=JAAS LoginContext created for username [{0}]
 jaasRealm.loginException=Login exception authenticating username [{0}]
 jaasRealm.rolePrincipalAdd=Adding role Principal [{0}] to this user Principal''s roles
 jaasRealm.rolePrincipalFailure=No valid role Principals found.
-jaasRealm.rolePrincipalSuccess={0} role Principal(s) found
+jaasRealm.rolePrincipalSuccess=[{0}] role Principal(s) found
 jaasRealm.unexpectedError=Unexpected error
 jaasRealm.userPrincipalFailure=No valid user Principal found
 jaasRealm.userPrincipalSuccess=Principal [{0}] is a valid user class. We will use this as the user Principal.
@@ -62,8 +62,8 @@ jdbcRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
 jdbcRealm.authenticateSuccess=Username [{0}] successfully authenticated
 jdbcRealm.close=Exception closing database connection
 jdbcRealm.exception=Exception performing authentication
-jdbcRealm.getPassword.exception=Exception retrieving password for "{0}"
-jdbcRealm.getRoles.exception=Exception retrieving roles for "{0}"
+jdbcRealm.getPassword.exception=Exception retrieving password for [{0}]
+jdbcRealm.getRoles.exception=Exception retrieving roles for [{0}]
 jdbcRealm.open=Exception opening database connection
 jdbcRealm.open.invalidurl=Driver [{0}] does not support the url [{1}]
 
@@ -96,9 +96,9 @@ realmBase.alreadyStarted=This Realm has already been started
 realmBase.authenticateFailure=Username [{0}] NOT successfully authenticated
 realmBase.authenticateSuccess=Username [{0}] successfully authenticated
 realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an X509UsernameRetriever.
-realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class {0}.
-realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object of type {0}.
-realmBase.createUsernameRetriever.InstantiationException=Cannot create object of type {0}.
+realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class [{0}].
+realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object of type [{0}].
+realmBase.createUsernameRetriever.InstantiationException=Cannot create object of type [{0}].
 realmBase.credentialNotDelegated=Credential for user [{0}] has not been delegated though storing was requested
 realmBase.delegatedCredentialFail=Unable to obtain delegated credential for user [{0}]
 realmBase.digest=Error digesting user credentials
@@ -111,7 +111,7 @@ realmBase.hasRoleSuccess=Username [{0}] has role [{1}]
 realmBase.notAuthenticated=Configuration error:  Cannot perform access control without an authenticated principal
 realmBase.notStarted=This Realm has not yet been started
 
-userDatabaseRealm.authenticateError=Login configuration error authenticating username {0}
+userDatabaseRealm.authenticateError=Login configuration error authenticating username [{0}]
 userDatabaseRealm.lookup=Exception looking up UserDatabase under key [{0}]
 userDatabaseRealm.noDatabase=No UserDatabase component found under key [{0}]
 userDatabaseRealm.noEngine=No Engine component found in container hierarchy
diff --git a/java/org/apache/catalina/realm/LocalStrings_es.properties b/java/org/apache/catalina/realm/LocalStrings_es.properties
index b939d08..7c2fb27 100644
--- a/java/org/apache/catalina/realm/LocalStrings_es.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_es.properties
@@ -31,29 +31,29 @@ dataSourceRealm.getPassword.exception=Excepción recuperando contraseña para [{
 dataSourceRealm.getRoles.exception=Excepción recuperando papeles para [{0}]
 dataSourceRealm.open=Excepción abriendo conexión a base de datos
 
-jaasCallback.digestpassword=Resumida contraseña "{0}" como "{1}"
-jaasCallback.password=Devuelta contraseña "{0}"
+jaasCallback.digestpassword=Resumida contraseña [{0}] como [{1}]
+jaasCallback.password=Devuelta contraseña [{0}]
 jaasCallback.username=Devuelto nombre de usuario [{0}]
 
 jaasRealm.accountExpired=El usuario [{0}] NO ha sido autentificado porque ha expirado su cuenta
 jaasRealm.authenticateFailure=Nombre de usuario [{0}] NO autenticado con éxito
 jaasRealm.authenticateSuccess=Nombre de usuario [{0}] autenticado con éxito como Principal [{1}] -- También se ha creado el Asunto
 jaasRealm.beginLogin=JAASRealm login requerido para nombre de usuario [{0}] usando LoginContext para aplicación [{1}]
-jaasRealm.cachePrincipal=Usuario Principal "{0}" en caché; tiene {1} papel de Principal
+jaasRealm.cachePrincipal=Usuario Principal [{0}] en caché; tiene [{1}] papel de Principal
 jaasRealm.checkPrincipal=Revisando Principal [{0}] [{1}]
 jaasRealm.credentialExpired=El usuario [{0}] NO ha sido autentificado porque ha expirado su credencial
 jaasRealm.failedLogin=El usuario [{0}] NO ha sido autentificado porque ha fallado el login
 jaasRealm.isInRole.match=Hallado papel de Principal coincidente.
 jaasRealm.isInRole.noMatch=NO hallado papel de Principal coincidente.
 jaasRealm.isInRole.noPrincipalOrRole=No se han hallado papeles de Principal. El usuario Principal o el Asunto es nulo o el usuario Principal no está en caché
-jaasRealm.isInRole.possessesRole=El Usuario Principal tiene un papele de Principal llamado "{0}"
-jaasRealm.isInRole.principalCached=El Usuario Principal tiene {0} papeles de Principal
-jaasRealm.isInRole.start=Revisando si el usuario Principal "{0}" tiene el papel "{1}"
+jaasRealm.isInRole.possessesRole=El Usuario Principal tiene un papele de Principal llamado [{0}]
+jaasRealm.isInRole.principalCached=El Usuario Principal tiene [{0}] papeles de Principal
+jaasRealm.isInRole.start=Revisando si el usuario Principal [{0}] tiene el papel [{1}]
 jaasRealm.loginContextCreated=JAAS LoginContext creado para nombre de usuario [{0}]
 jaasRealm.loginException=Excepción de Login autenticando nombre de usuario [{0}]
 jaasRealm.rolePrincipalAdd=Añadiend papel Principal [{0}] a los papeles de este usuario Principal
 jaasRealm.rolePrincipalFailure=No se han hallado papeles de Principal válidos.
-jaasRealm.rolePrincipalSuccess=hallado {0} papeles de Principal
+jaasRealm.rolePrincipalSuccess=hallado [{0}] papeles de Principal
 jaasRealm.unexpectedError=Error inesperado
 jaasRealm.userPrincipalFailure=No se ha hallado usuario Principal
 jaasRealm.userPrincipalSuccess=El Principal [{0}] es una clase válida de usuario. La vamos a usar como usuario Principal.
@@ -62,8 +62,8 @@ jdbcRealm.authenticateFailure=El usuario [{0}] NO ha sido autentificado correcta
 jdbcRealm.authenticateSuccess=El usuario [{0}] ha sido autentificado correctamente
 jdbcRealm.close=Excepción al cerrar la conexión a la base de datos
 jdbcRealm.exception=Excepción al realizar la autentificación
-jdbcRealm.getPassword.exception=Excepción recuperando contraseña para "{0}"
-jdbcRealm.getRoles.exception=Excepción recuperando papeles para "{0}"
+jdbcRealm.getPassword.exception=Excepción recuperando contraseña para [{0}]
+jdbcRealm.getRoles.exception=Excepción recuperando papeles para [{0}]
 jdbcRealm.open=Excepción abriendo la conexión a la base de datos
 jdbcRealm.open.invalidurl=El conductor [{0}] no soporta la url [{1}]
 
@@ -97,7 +97,7 @@ realmBase.hasRoleSuccess=El usuario [{0}] desempeña el papel de [{1}]
 realmBase.notAuthenticated=Error de Configuración: No se pueden realizar funciones de control de acceso sin un principal autentificado
 realmBase.notStarted=Este dominio aún no ha sido inicializado
 
-userDatabaseRealm.authenticateError=Error de configuración de Login autenticando nombre de usuario {0}
+userDatabaseRealm.authenticateError=Error de configuración de Login autenticando nombre de usuario [{0}]
 userDatabaseRealm.lookup=Excepción buscando en Base de datos de Usuario mediante la clave [{0}]
 userDatabaseRealm.noDatabase=No se ha hallado componente de Base de datos de Usuario mediante la clave [{0}]
 userDatabaseRealm.noEngine=No se ha hallado componente de Motor en jerarquía de contenedor
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index a6e9b3c..d5980f8 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -93,7 +93,7 @@ realmBase.hasRoleSuccess=Le nom d''utilisateur [{0}] a pour rôle [{1}]
 realmBase.notAuthenticated=Erreur de configuration:  Impossible de conduire un contrôle d''accès sans un principal authentifié (authenticated principal)
 realmBase.notStarted=Ce royaume (Realm) n''a pas encore été démarré
 
-userDatabaseRealm.authenticateError=Erreur de configuration du contrôle d''accès (login) lors de l''authentification du nom d''utilisateur {0}
+userDatabaseRealm.authenticateError=Erreur de configuration du contrôle d''accès (login) lors de l''authentification du nom d''utilisateur [{0}]
 userDatabaseRealm.lookup=Exception lors de la recherche dans la base de données utilisateurs avec la clé [{0}]
 userDatabaseRealm.noDatabase=Aucun composant base de données utilisateurs trouvé pour la clé [{0}]
 userDatabaseRealm.noEngine=Aucun composant moteur (engine component) trouvé dans la hiérarchie des conteneurs
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 5325a69..8e29661 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -94,7 +94,7 @@ realmBase.hasRoleSuccess=ユーザ名 [{0}] はロール [{1}] を持ってい
 realmBase.notAuthenticated=設定エラー:  認証された主体なしではアクセス制御が実行できません
 realmBase.notStarted=このレルムはまだ起動されていません
 
-userDatabaseRealm.authenticateError=ユーザ名 {0} を認証中にログイン設定エラーが発生しました
+userDatabaseRealm.authenticateError=ユーザ名 [{0}] を認証中にログイン設定エラーが発生しました
 userDatabaseRealm.lookup=キー [{0}] でユーザデータベースを検索中の例外です
 userDatabaseRealm.noDatabase=キー [{0}] でユーザデータベースコンポーネントが見つかりません
 userDatabaseRealm.noEngine=コンテナ階層中にエンジンコンポーネントが見つかりません
diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index 1b429f6..f9ddb04 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -36,7 +36,7 @@ fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.saving=Saving Session [{0}] to file [{1}]
 
 managerBase.contextNull=The Container must be set to a non-null Context instance before the Manager is used
-managerBase.createRandom=Created random number generator for session ID generation in {0}ms.
+managerBase.createRandom=Created random number generator for session ID generation in [{0}]ms.
 managerBase.createSession.ise=createSession: Too many active sessions
 managerBase.sessionAttributeNameFilter=Skipped session attribute named [{0}] because it did not match the name filter [{1}]
 managerBase.sessionAttributeValueClassNameFilter=Skipped session attribute named [{0}] because the value type [{1}] did not match the filter [{2}]
@@ -44,13 +44,13 @@ managerBase.sessionTimeout=Invalid session timeout setting [{0}]
 managerBase.setContextNotNew=It is illegal to call setContext() to change the Context associated with a Manager if the Manager is not in the NEW state
 managerBase.setMaxInactiveIntervalUnused=Manager.setMaxInactiveInterval() is deprecated and calls to this method are ignored. Session timeouts should be configured in web.xml or via Context.setSessionTimeout(int timeoutInMinutes)
 
-persistentManager.activeSession=Session {0} has been idle for {1} seconds
-persistentManager.backupException=Exception occurred when backing up Session {0}: {1}
+persistentManager.activeSession=Session [{0}] has been idle for [{1}] seconds
+persistentManager.backupException=Exception occurred when backing up Session [{0}]: [{1}]
 persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for [{1}] seconds
 persistentManager.deserializeError=Error deserializing Session [{0}]
-persistentManager.expiring=Expiring {0} sessions before saving them
+persistentManager.expiring=Expiring [{0}] sessions before saving them
 persistentManager.loading=Loading [{0}] persisted sessions
-persistentManager.processSwaps=Checking for sessions to swap out, {0} active sessions in memory
+persistentManager.processSwaps=Checking for sessions to swap out, [{0}] active sessions in memory
 persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
 persistentManager.storeKeysException=Unable to determine the list of session IDs for sessions in the session store, assuming that the store is empty
 persistentManager.storeSizeException=Unable to determine the number of sessions in the session store, assuming that the store is empty
@@ -66,13 +66,13 @@ serverSession.value.iae=null value
 
 standardManager.expireException=processsExpire:  Exception during session expiration
 standardManager.loading=Loading persisted sessions from [{0}]
-standardManager.loading.cnfe=ClassNotFoundException while loading persisted sessions: {0}
-standardManager.loading.ioe=IOException while loading persisted sessions: {0}
+standardManager.loading.cnfe=ClassNotFoundException while loading persisted sessions: [{0}]
+standardManager.loading.ioe=IOException while loading persisted sessions: [{0}]
 standardManager.managerLoad=Exception loading sessions from persistent storage
 standardManager.managerUnload=Exception unloading sessions to persistent storage
 standardManager.unloading=Saving persisted sessions to [{0}]
 standardManager.unloading.debug=Unloading persisted sessions
-standardManager.unloading.ioe=IOException while saving persisted sessions: {0}
+standardManager.unloading.ioe=IOException while saving persisted sessions: [{0}]
 standardManager.unloading.nosessions=No persisted sessions to unload
 
 standardSession.attributeEvent=Session attribute event listener threw exception
@@ -91,7 +91,7 @@ standardSession.logoutfail=Exception logging out user when expiring session
 standardSession.notDeserializable=Cannot deserialize session attribute [{0}] for session [{1}]
 standardSession.notSerializable=Cannot serialize session attribute [{0}] for session [{1}]
 standardSession.removeAttribute.ise=removeAttribute: Session already invalidated
-standardSession.sessionCreated=Created Session id = {0}
+standardSession.sessionCreated=Created Session id = [{0}]
 standardSession.sessionEvent=Session event listener threw exception
 standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
 standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been invalidated
diff --git a/java/org/apache/catalina/session/LocalStrings_es.properties b/java/org/apache/catalina/session/LocalStrings_es.properties
index dbb680b..9834881 100644
--- a/java/org/apache/catalina/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/session/LocalStrings_es.properties
@@ -35,13 +35,13 @@ managerBase.createSession.ise=createSession: Demasiadas sesiones activas
 managerBase.sessionTimeout=Valor inválido de Tiempo Agotado de sesión [{0}]
 managerBase.setContextNotNew=Es ilegal llamar a setContext() para cambiar el Contexto associado con un Manejador si el Manejador no esta en el estado NEW.
 
-persistentManager.activeSession=La sesión {0} ha estado ociosa durante {1} segundos
-persistentManager.backupException=Ha tenido lugar una excepción al respaldar la Sesión {0}: {1}
+persistentManager.activeSession=La sesión [{0}] ha estado ociosa durante [{1}] segundos
+persistentManager.backupException=Ha tenido lugar una excepción al respaldar la Sesión [{0}]: [{1}]
 persistentManager.backupMaxIdle=Respaldando sesión [{0}] a Almacén, ociosa durante [{1}] segundos
 persistentManager.deserializeError=Error des-serializando Sesión [{0}]: [{1}]
-persistentManager.expiring=Expirando {0} sesiones antes de salvarlas
+persistentManager.expiring=Expirando [{0}] sesiones antes de salvarlas
 persistentManager.loading=Cargando [{0}] sesiones persistidas
-persistentManager.processSwaps=Mirando qué sesiones intercambiar a fuera, {0} sesiones activas en memoria
+persistentManager.processSwaps=Mirando qué sesiones intercambiar a fuera, [{0}] sesiones activas en memoria
 persistentManager.serializeError=Error serializando Sesión [{0}]: [{1}]
 persistentManager.storeKeysException=Imposible determinar la lista de IDs de sesiones en la tienda de sesiones, asumiendo que la tienda esta vacia
 persistentManager.storeSizeException=No se puede determinar el numero de sesiones en el almacenamiento de sesiones, asumiendo que el almacenamiento esta vacío
@@ -55,12 +55,12 @@ serverSession.value.iae=valor nulo
 
 standardManager.expireException=processsExpire: Excepción durante la expiración de sesión
 standardManager.loading=Cargando sesiones persistidas desde [{0}]
-standardManager.loading.cnfe=ClassNotFoundException al cargar sesiones persistidas: {0}
-standardManager.loading.ioe=IOException al cargar sesiones persistidas: {0}
+standardManager.loading.cnfe=ClassNotFoundException al cargar sesiones persistidas: [{0}]
+standardManager.loading.ioe=IOException al cargar sesiones persistidas: [{0}]
 standardManager.managerLoad=Excepción cargando sesiones desde almacenamiento persistente
 standardManager.managerUnload=Excepción descargando sesiones a almacenamiento persistente
 standardManager.unloading=Salvando sesiones persistidas a [{0}]
-standardManager.unloading.ioe=IOException al salvar sesiones persistidas: {0}
+standardManager.unloading.ioe=IOException al salvar sesiones persistidas: [{0}]
 
 standardSession.attributeEvent=El oyente de eventos de atributo de Sesión lanzó una excepción
 standardSession.bindingEvent=El oyente de eventos de ligado de Sesión lanzó una excepción
@@ -76,7 +76,7 @@ standardSession.invalidate.ise=invalidate: La Sesión ya ha sido invalidada
 standardSession.isNew.ise=isNew: La Sesión ya ha sido invalidada
 standardSession.notSerializable=No puedo serializar atributo de sesión [{0}] para sesión [{1}]
 standardSession.removeAttribute.ise=removeAttribute: La Sesión ya ha sido invalidada
-standardSession.sessionCreated=Creada Sesión id = {0}
+standardSession.sessionCreated=Creada Sesión id = [{0}]
 standardSession.sessionEvent=El oyente de evento de Sesión lanzó una execpción
 standardSession.setAttribute.iae=setAttribute: Atributo [{0}] no serializable
 standardSession.setAttribute.ise=setAttribute: La Sesión ya ha sido invalidada
diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index 7cc78da..833e8d8 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -41,13 +41,13 @@ managerBase.sessionAttributeValueClassNameFilter=L''attribut de session nommé [
 managerBase.sessionTimeout=Réglage du délai d''inactivité (timeout) de session invalide [{0}]
 managerBase.setContextNotNew=Il est illégal d'appeler setContext() pour changer le contexte associé avec un gestionnaire (Manager) si le genstionnaire n'est pas dans l'état nouveau
 
-persistentManager.activeSession=La session {0} a été en attente durant {1} secondes
-persistentManager.backupException=Exception lors de la sauvegarde de la session {0}: {1}
+persistentManager.activeSession=La session [{0}] a été en attente durant [{1}] secondes
+persistentManager.backupException=Exception lors de la sauvegarde de la session [{0}]: [{1}]
 persistentManager.backupMaxIdle=Sauvegarde de la session [{0}] vers le stockage (Store), en attente pour [{1}] secondes
 persistentManager.deserializeError=Erreur lors de la désérialisation de la session [{0}]
-persistentManager.expiring=Expiration de {0} sessions avant leur sauvegarde
+persistentManager.expiring=Expiration de [{0}] sessions avant leur sauvegarde
 persistentManager.loading=Chargement de [{0}] sessions persistantes
-persistentManager.processSwaps=Recherche de sessions à basculer vers stockage (swap out), {0} sessions actives en mémoire
+persistentManager.processSwaps=Recherche de sessions à basculer vers stockage (swap out), [{0}] sessions actives en mémoire
 persistentManager.serializeError=Erreur lors de la sérialisation de la session [{0}]: [{1}]
 persistentManager.storeKeysException=Incapacité de déterminer la liste des ID de session, pour les sessions dans le magasin de sessions.  Supposant le magasin vide.
 persistentManager.storeSizeException=Impossible de déterminer le nombre de sessions dans le magasin de sessions, le magasin doit être vide.
@@ -63,13 +63,13 @@ serverSession.value.iae=valeur nulle
 
 standardManager.expireException="processsExpire":  Exception lors de l''expiration de la session
 standardManager.loading=Chargement des sessions qui ont persisté depuis [{0}]
-standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de sessions persistantes: {0}
-standardManager.loading.ioe="IOException" lors du chargement de sessions persistantes: {0}
+standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de sessions persistantes: [{0}]
+standardManager.loading.ioe="IOException" lors du chargement de sessions persistantes: [{0}]
 standardManager.managerLoad=Exception au chargement des sessions depuis le stockage persistant (persistent storage)
 standardManager.managerUnload=Exception au déchargement des sessions vers le stockage persistant (persistent storage)
 standardManager.unloading=Sauvegarde des sessions ayant persisté vers [{0}]
 standardManager.unloading.debug=Déchargement des session persistées
-standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions persistantes: {0}
+standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions persistantes: [{0}]
 standardManager.unloading.nosessions=Aucune session persistée à décharger
 
 standardSession.attributeEvent=L'écouteur d'évènement Attribut de Session (attribute event listener) a généré une exception
@@ -88,7 +88,7 @@ standardSession.logoutfail=Exception lors de la déconnection de l'utilisateur,
 standardSession.notDeserializable=Impossible de désérialiser l''attribut de session [{0}] pour la session [{1}]
 standardSession.notSerializable=Impossible de sérialiser l''attribut de session [{0}] pour la session [{1}]
 standardSession.removeAttribute.ise="removeAttribute": Session déjà invalidée
-standardSession.sessionCreated=Création de l''Id de Session = {0}
+standardSession.sessionCreated=Création de l''Id de Session = [{0}]
 standardSession.sessionEvent=L'écouteur d'évènement de session (session event listener) a généré une exception
 standardSession.setAttribute.iae="setAttribute": Attribut [{0}] non sérialisable
 standardSession.setAttribute.ise="setAttribute": Session déjà invalidée
diff --git a/java/org/apache/catalina/session/LocalStrings_ja.properties b/java/org/apache/catalina/session/LocalStrings_ja.properties
index dfbc696..df84370 100644
--- a/java/org/apache/catalina/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ja.properties
@@ -41,13 +41,13 @@ managerBase.sessionAttributeValueClassNameFilter=値タイプ[{1}]がフィル
 managerBase.sessionTimeout=無効なセッションタイムアウト設定です [{0}]
 managerBase.setContextNotNew=NEW 状態ではないマネージャーに関連付けられた Context を変更するために setContext() を呼び出すことは禁止されています。
 
-persistentManager.activeSession=セッション {0} は{1}秒間アイドルしています
-persistentManager.backupException=セッション {0} をバックアップする時に例外が発生しました: {1}
+persistentManager.activeSession=セッション [{0}] は[{1}]秒間アイドルしています
+persistentManager.backupException=セッション [{0}] をバックアップする時に例外が発生しました: [{1}]
 persistentManager.backupMaxIdle=[{1}]秒間アイドルしているセッション [{0}] を保存するためにバックアップしています
 persistentManager.deserializeError=セッション [{0}] をデシリアライズ中のエラーです。
-persistentManager.expiring={0} のセッションを保存する前に期限切れになりました
+persistentManager.expiring=[{0}] のセッションを保存する前に期限切れになりました
 persistentManager.loading=[{0}] の持続されたセッションをロードします
-persistentManager.processSwaps=セッションをスワップするためにチェックしています, メモリ中に {0} アクティブセッションが存在します
+persistentManager.processSwaps=セッションをスワップするためにチェックしています, メモリ中に [{0}] アクティブセッションが存在します
 persistentManager.serializeError=セッション [{0}] をシリアライズ中のエラーです: [{1}]
 persistentManager.storeKeysException=セッションストアからセッションIDのリストを取得できませんでした。セッションストアが空の可能性があります。
 persistentManager.storeSizeException=セッションストアに格納しているセッションの総数を確認できなかったため、セッションストアは空になっているものとして扱います。
@@ -63,13 +63,13 @@ serverSession.value.iae=null値です
 
 standardManager.expireException=processsExpire: セッションの終了処理中の例外です
 standardManager.loading=[{0}] から持続されたセッションをロードしています
-standardManager.loading.cnfe=持続されたセッションをロード中にClassNotFoundExceptionが発生しました: {0}
-standardManager.loading.ioe=持続されたセッションをロード中のIOExceptionです: {0}
+standardManager.loading.cnfe=持続されたセッションをロード中にClassNotFoundExceptionが発生しました: [{0}]
+standardManager.loading.ioe=持続されたセッションをロード中のIOExceptionです: [{0}]
 standardManager.managerLoad=永続記憶装置からセッションをロード中の例外です
 standardManager.managerUnload=永続記憶装置にセッションをアンロード中の例外です
 standardManager.unloading=持続されたセッションを [{0}] に保存します
 standardManager.unloading.debug=永続セッションのアンロード
-standardManager.unloading.ioe=持続されたセッションの保存中のIOExceptionです: {0}
+standardManager.unloading.ioe=持続されたセッションの保存中のIOExceptionです: [{0}]
 standardManager.unloading.nosessions=アンロードする永続セッションがありません
 
 standardSession.attributeEvent=セッション属性イベントリスナが例外を投げました
@@ -88,7 +88,7 @@ standardSession.logoutfail=有効期限を超過したセッションからユ
 standardSession.notDeserializable=セッション[{1}]のセッション属性[{0}]をデシリアライズできません。
 standardSession.notSerializable=セッション [{1}] のためにセッション属性 [{0}] をシリアライズできません
 standardSession.removeAttribute.ise=removeAttribute: セッションは既に無効化されています
-standardSession.sessionCreated=セッションID = {0} を生成しました
+standardSession.sessionCreated=セッションID = [{0}] を生成しました
 standardSession.sessionEvent=セッションイベントリスナが例外を投げました
 standardSession.setAttribute.iae=setAttribute: シリアライズできない属性です
 standardSession.setAttribute.ise=setAttribute: セッションは既に無効化されています
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index 883484f..cb76e8e 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -97,7 +97,7 @@ hostConfig.cce=Lifecycle event data object [{0}] is not a Host
 hostConfig.context.remove=Error while removing context [{0}]
 hostConfig.context.restart=Error during context [{0}] restart
 hostConfig.createDirs=Unable to create directory for deployment: [{0}]
-hostConfig.deploy=Deploying web application directory {0}
+hostConfig.deploy=Deploying web application directory [{0}]
 hostConfig.deploy.error=Exception while deploying web application directory [{0}]
 hostConfig.deployDescriptor=Deploying deployment descriptor [{0}]
 hostConfig.deployDescriptor.blocked=The web application with context path [{0}] was not deployed because it contained a deployment descriptor [{1}] which may include configuration necessary for the secure deployment of the application but processing of deployment descriptors is prevented by the deployXML setting of this host. An appropriate descriptor should be created at [{2}] to deploy this application.
@@ -124,8 +124,8 @@ hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ign
 hostConfig.jmx.register=Register context [{0}] failed
 hostConfig.jmx.unregister=Unregister context [{0}] failed
 hostConfig.reload=Reloading context [{0}]
-hostConfig.removeDIR=Directory {0} is undeployed
-hostConfig.removeWAR=War {0} is undeployed
+hostConfig.removeDIR=Directory [{0}] is undeployed
+hostConfig.removeWAR=War [{0}] is undeployed
 hostConfig.removeXML=Context [{0}] is undeployed
 hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}] since [{1}] is not an absolute path
 hostConfig.start=HostConfig: Processing START
@@ -135,8 +135,8 @@ hostConfig.undeployVersion=Undeploying old version of context [{0}] which has no
 
 passwdUserDatabase.readFail=Failed to obtain a complete set of users from /etc/passwd
 
-tldConfig.addListeners=Adding {0} listeners from TLD files
-tldConfig.cce=Lifecycle event data object {0} is not a Context
+tldConfig.addListeners=Adding [{0}] listeners from TLD files
+tldConfig.cce=Lifecycle event data object [{0}] is not a Context
 tldConfig.dirFail=Failed to process directory [{0}] for TLD files
 tldConfig.dirScan=Scanning for TLD files in directory [{0}]
 tldConfig.execute=Error processing TLD files for context with name [{0}]
@@ -183,8 +183,8 @@ webAnnotationSet.invalidInjection=Invalid method resource injection annotation.
 webRuleSet.absoluteOrdering=<absolute-ordering> element not valid in web-fragment.xml and will be ignored
 webRuleSet.absoluteOrderingCount=<absolute-ordering> element is limited to 1 occurrence
 webRuleSet.nameCount=<name> element is limited to 1 occurrence
-webRuleSet.postconstruct.duplicate=Duplicate post construct method definition for class {0}
-webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for class {0}
+webRuleSet.postconstruct.duplicate=Duplicate post construct method definition for class [{0}]
+webRuleSet.predestroy.duplicate=Duplicate pre destroy method definition for class [{0}]
 webRuleSet.relativeOrdering=<ordering> element not valid in web.xml and will be ignored
 webRuleSet.relativeOrderingCount=<ordering> element is limited to 1 occurrence
 
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties b/java/org/apache/catalina/startup/LocalStrings_es.properties
index 769eb3c..2b31962 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -86,8 +86,8 @@ hostConfig.cce=El objeto de los datos de evento de ciclo de vida (Lifecycle even
 hostConfig.context.remove=Error al quitar contexto [{0}]
 hostConfig.context.restart=Error durante el arranque del contexto [{0}]
 hostConfig.createDirs=No puedo crear directorio para despliegue: [{0}]
-hostConfig.deploy=Desplieque del directorio {0} de la aplicación web
-hostConfig.deploy.error=Excepción en el directorio {0} de la aplicación web
+hostConfig.deploy=Desplieque del directorio [{0}] de la aplicación web
+hostConfig.deploy.error=Excepción en el directorio [{0}] de la aplicación web
 hostConfig.deployDescriptor=Desplieque del descriptor de configuración [{0}]
 hostConfig.deployDescriptor.error=Error durante el despliegue del descriptor de configuración [{0}]
 hostConfig.deployDescriptor.localDocBaseSpecified=Se ha especificado un docBase [{0}] dentro del appBase de la máquina y será ignorado
@@ -98,8 +98,8 @@ hostConfig.deployWar.error=Error durante el despliegue del archivo [{0}] de la a
 hostConfig.deployWar.hiddenDir=El directorio [{0}] será ignorado debido a que el WAR [{1}] tiene prioridad y  unpackWARs es falso
 hostConfig.deploying=Desplegando aplicaciones web descubiertas
 hostConfig.docBaseUrlInvalid=El docBase proporcionado no puede ser expresado como una URL
-hostConfig.expand=Descompresión del archivo {0} de la aplicación web
-hostConfig.expand.error=Excepción durante la descompresión del archivo {0} de la aplicación web
+hostConfig.expand=Descompresión del archivo [{0}] de la aplicación web
+hostConfig.expand.error=Excepción durante la descompresión del archivo [{0}] de la aplicación web
 hostConfig.expanding=Descubierta descompresión de archivos de aplicaciones web
 hostConfig.ignorePath=Ignorando ruta [{0}] en appBase para despliegue automático
 hostConfig.illegalWarName=El nombre de war [{0}] es inválido. El archivo será ignorado.
@@ -112,10 +112,10 @@ hostConfig.removeXML=El context [{0}] está replegado
 hostConfig.start="HostConfig": Procesando "START"
 hostConfig.stop="HostConfig": Procesando "STOP"
 hostConfig.undeploy=Repliegue (undeploy) de la aplicación web que tiene como trayectoria de contexto [{0}]
-hostConfig.undeploy.error=Error durante el repliegue (undeploy) de la aplicación web que tiene como trayectoria de contexto {0}
+hostConfig.undeploy.error=Error durante el repliegue (undeploy) de la aplicación web que tiene como trayectoria de contexto [{0}]
 
-tldConfig.addListeners=Añadiendo {0} oyentes desde ficheros TLD
-tldConfig.cce=El objeto de datos de eventos de Ciclo de vida {0} no se encuentra en el  Contexto
+tldConfig.addListeners=Añadiendo [{0}] oyentes desde ficheros TLD
+tldConfig.cce=El objeto de datos de eventos de Ciclo de vida [{0}] no se encuentra en el  Contexto
 tldConfig.dirFail=No pude procesar el directorio [{0}] para ficheros TLD
 tldConfig.dirScan=Explorando en busca de ficheros TLD en directorio [{0}]
 tldConfig.execute=Error al procesar ficheros TLD para el contexto con nombre [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_fr.properties b/java/org/apache/catalina/startup/LocalStrings_fr.properties
index 5b4f60b..d485d05 100644
--- a/java/org/apache/catalina/startup/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_fr.properties
@@ -91,7 +91,7 @@ hostConfig.cce=L''objet donnée évènement cycle de vie (Lifecycle event data o
 hostConfig.context.remove=Erreur en enlevant le contexte [{0}]
 hostConfig.context.restart=Erreur pendant le redémarrage du contexte [{0}]
 hostConfig.createDirs=Impossible de créer un répertoire pour le déploiement: [{0}]
-hostConfig.deploy=Déploiement du répertoire {0} de l''application web
+hostConfig.deploy=Déploiement du répertoire [{0}] de l''application web
 hostConfig.deploy.error=Exception lors du déploiement du répertoire [{0}] de l''application web
 hostConfig.deployDescriptor=Déploiement du descripteur de configuration [{0}]
 hostConfig.deployDescriptor.blocked=L''application web dont le chemin est [{0}] n''a pas été déployée car elle contenait un descripteur de déploiement [{1}] qui pourrait inclure de la configuration nécessaire pour le déploiement sécurisé de l''application mais ce traitement est empêché par le paramètre deployXML pour cet hôte, un descripteur approprié devrait être crée à [{2}] pour déployer cette application
@@ -122,7 +122,7 @@ hostConfig.resourceNotAbsolute=Impossible d''enlever la ressource du contexte [{
 hostConfig.start="HostConfig": Traitement du "START"
 hostConfig.stop="HostConfig": Traitement du "STOP"
 hostConfig.undeploy=Retrait de l''application web ayant pour chemin de contexte [{0}]
-hostConfig.undeploy.error=Erreur lors du repli (undeploy) de l''application web ayant pour chemin de contexte {0}
+hostConfig.undeploy.error=Erreur lors du repli (undeploy) de l''application web ayant pour chemin de contexte [{0}]
 hostConfig.undeployVersion=Retrait de l''ancienne version du contexte [{0}] car elle n''a pas de session active
 hostConfig.undeploying=Repli des applications web déployées
 
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index a267028..66e27fa 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -91,7 +91,7 @@ hostConfig.cce=ライフサイクルイベントデータオブジェクト [{0}
 hostConfig.context.remove=コンテキスト [{0}] の削除中に異常が発生しました。
 hostConfig.context.restart=コンテキスト [{0}] を再起動中のエラーです
 hostConfig.createDirs=配備用のディレクトリを作成できません:[{0}]
-hostConfig.deploy=Webアプリケーションディレクトリ {0} を配備します
+hostConfig.deploy=Webアプリケーションディレクトリ [{0}] を配備します
 hostConfig.deploy.error=Webアプリケーションディレクトリ[{0}]を展開中に例外が発生しました。
 hostConfig.deployDescriptor=設定記述子 [{0}] を配備します
 hostConfig.deployDescriptor.blocked=コンテキストパス[{0}]を持つWebアプリケーションは、アプリケーションのセキュアな配備に必要な設定が含まれている可能性があるが、このホストのdeployXML設定によって配備記述子の処理が妨げられる配備記述子[{1}]が含まれていたためデプロイされていません。このアプリケーションを配備するには、[{2}]に適切な記述子を作成する必要があります。\n
@@ -118,14 +118,14 @@ hostConfig.illegalWarName=War名[{0}]は無効です。 アーカイブは無視
 hostConfig.jmx.register=コンテキスト[{0}]を登録できませんでした
 hostConfig.jmx.unregister=コンテキスト[{0}]の登録を解除できませんでした
 hostConfig.reload=リロード中のコンテキスト [{0}]
-hostConfig.removeDIR=ディレクトリ {0} の配備を解除しました
-hostConfig.removeWAR=WARファイル {0} の配備を解除しました
-hostConfig.removeXML=コンテキスト {0} の配備を解除しました
+hostConfig.removeDIR=ディレクトリ [{0}] の配備を解除しました
+hostConfig.removeWAR=WARファイル [{0}] の配備を解除しました
+hostConfig.removeXML=コンテキスト [{0}] の配備を解除しました
 hostConfig.resourceNotAbsolute=[{1}] は完全パスではないためコンテキスト [{0}] からリソースを削除できません。
 hostConfig.start=HostConfig: 処理を停止します
 hostConfig.stop=HostConfig: 処理を停止します
 hostConfig.undeploy=コンテキストパス [{0}] のWebアプリケーションの配備を解除します
-hostConfig.undeploy.error=コンテキストパス {0} のWebアプリケーションの配備を解除中のエラーです
+hostConfig.undeploy.error=コンテキストパス [{0}] のWebアプリケーションの配備を解除中のエラーです
 hostConfig.undeployVersion=コンテキスト [{0}] について有効なセッションの存在しない古いバージョンの配置を解除します。
 hostConfig.undeploying=配備されたWebアプリケーションの配備を解除しています
 
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index e9bab46..e31aa71 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cluster.mbean.register.already=MBean {0} already registered!
+cluster.mbean.register.already=MBean [{0}] already registered!
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties b/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
index 9425aa4..75c3c72 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cluster.mbean.register.already=¡El MBean {0} ya está registrado!
+cluster.mbean.register.already=¡El MBean [{0}] ya está registrado!
diff --git a/java/org/apache/catalina/tribes/transport/LocalStrings.properties b/java/org/apache/catalina/tribes/transport/LocalStrings.properties
index 6abbd7e..78c7e91 100644
--- a/java/org/apache/catalina/tribes/transport/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/transport/LocalStrings.properties
@@ -31,11 +31,11 @@ IDataSender.send.again=Send data again to [{0}:{1,number,integer}]
 IDataSender.send.crash=Send message crashed [{0}:{1,number,integer}] type=[{2}], id=[{3}]
 IDataSender.send.lost=Message lost: [{0}:{1,number,integer}] type=[{2}], id=[{3}]
 IDataSender.send.message=Send message to [{0}:{1,number,integer}] id=[{2}] size={3,number,integer}
-IDataSender.senderModes.Configured=Configured a data replication sender for mode {0}
-IDataSender.senderModes.Instantiate=Can''t instantiate a data replication sender of class {0}
-IDataSender.senderModes.Missing=Can''t configure a data replication sender for mode {0}
+IDataSender.senderModes.Configured=Configured a data replication sender for mode [{0}]
+IDataSender.senderModes.Instantiate=Can''t instantiate a data replication sender of class [{0}]
+IDataSender.senderModes.Missing=Can''t configure a data replication sender for mode [{0}]
 IDataSender.senderModes.Resources=Can't load data replication sender mapping list
-IDataSender.stats=Send stats from [{0}:{1,number,integer}], Nr of bytes sent={2,number,integer} over {3} = {4,number,integer} bytes/request, processing time {5,number,integer} msec, avg processing time {6,number,integer} msec
+IDataSender.stats=Send stats from [{0}:{1,number,integer}], Nr of bytes sent={2,number,integer} over [{3}] = {4,number,integer} bytes/request, processing time {5,number,integer} msec, avg processing time {6,number,integer} msec
 
 NioReceiver.stop.threadRunning=The NioReceiver thread did not stop in a timely manner. Errors may be observed when the selector is closed.
 
diff --git a/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties b/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
index 8871987..ed6db05 100644
--- a/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
+++ b/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
@@ -31,10 +31,10 @@ IDataSender.send.again=Enviar datos de nuevo a [{0}:{1,number,integer}]
 IDataSender.send.crash=Enviar mensaje se rompió [{0}:{1,number,integer}] tipo=[{2}], id=[{3}]
 IDataSender.send.lost=Mensaje perdido: [{0}:{1,number,integer}] tipo=[{2}], id=[{3}]
 IDataSender.send.message=Enviar mensaje a [{0}:{1,number,integer}] id=[{2}] medida={3,number,integer}
-IDataSender.senderModes.Configured=Configurado un remitente de réplica de datos para el modo {0}
-IDataSender.senderModes.Instantiate=No puedo instanciar remitente de réplica de datos de clase {0}
-IDataSender.senderModes.Missing=No puedo configurar remitente de réplica de datos para modo {0}
-IDataSender.senderModes.Resources=No puedo cargar lista de mapeo de remitente de réplica de datos de clase {0}
-IDataSender.stats=Estados de Envío desde [{0}:{1,number,integer}], Nr de bytes enviado={2,number,integer} sobre {3} = {4,number,integer} bytes/requerimiento, tiempo de proceso {5,number,integer} mseg, tiempo medio de proceso {6,number,integer} mseg
+IDataSender.senderModes.Configured=Configurado un remitente de réplica de datos para el modo [{0}]
+IDataSender.senderModes.Instantiate=No puedo instanciar remitente de réplica de datos de clase [{0}]
+IDataSender.senderModes.Missing=No puedo configurar remitente de réplica de datos para modo [{0}]
+IDataSender.senderModes.Resources=No puedo cargar lista de mapeo de remitente de réplica de datos de clase [{0}]
+IDataSender.stats=Estados de Envío desde [{0}:{1,number,integer}], Nr de bytes enviado={2,number,integer} sobre [{3}] = {4,number,integer} bytes/requerimiento, tiempo de proceso {5,number,integer} mseg, tiempo medio de proceso {6,number,integer} mseg
 
 PooledSender.senderDisconnectFail=No pude desconectar al remitente
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 94d5b57..a5d260e 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -133,7 +133,7 @@ remoteIpValve.syntax=Invalid regular expressions [{0}] provided.
 requestFilterValve.configInvalid=One or more invalid configuration settings were provided for the Remote[Addr|Host]Valve which prevented the Valve and its parent containers from starting
 requestFilterValve.deny=Denied request for [{0}] based on property [{1}]
 requestFilterValve.next=No ''next'' valve has been configured
-requestFilterValve.syntax=Syntax error in request filter pattern {0}
+requestFilterValve.syntax=Syntax error in request filter pattern [{0}]
 
 sslValve.certError=Failed to process certificate string [{0}] to create a java.security.cert.X509Certificate object
 sslValve.invalidProvider=The SSL provider specified on the connector associated with this request of [{0}] is invalid. The certificate data could not be processed.
diff --git a/java/org/apache/catalina/valves/LocalStrings_es.properties b/java/org/apache/catalina/valves/LocalStrings_es.properties
index 8e07186..b3d55f0 100644
--- a/java/org/apache/catalina/valves/LocalStrings_es.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_es.properties
@@ -83,7 +83,7 @@ remoteIpValve.syntax=Se han suministrado expresiones regulares [{0}] no válidas
 
 requestFilterValve.configInvalid=Uno o más parámetros de configuración inválidos fueron proveídos para  Remote[Addr|Host]Valve lo cual impide que el Valve y sus contenedores padres puedan iniciar
 requestFilterValve.next=No hay ''siguiente'' válvula configurada
-requestFilterValve.syntax=Error de sintáxis en petición de filtro patrón {0}
+requestFilterValve.syntax=Error de sintáxis en petición de filtro patrón [{0}]
 
 sslValve.certError=No pude procesar cadena de certificado [{0}] para crear un objeto  java.security.cert.X509Certificate
 sslValve.invalidProvider=El proveedor de SSL especificado en el conecto asociado con este requerimiento de [{0}] ies inválido. No se pueden procesar los datos del certificado.
diff --git a/java/org/apache/catalina/valves/LocalStrings_fr.properties b/java/org/apache/catalina/valves/LocalStrings_fr.properties
index dc73e44..93979a9 100644
--- a/java/org/apache/catalina/valves/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_fr.properties
@@ -125,7 +125,7 @@ remoteIpValve.invalidPortHeader=La valeur de port [{0}] trouvée dans l''en-têt
 requestFilterValve.configInvalid=Un ou plusieurs paramètres de configuration spécifiés pour ce Remote[Addr|Host]Valve ont empêché la Valve et le conteneur parent de démarrer
 requestFilterValve.deny=Refus de la requête pour [{0}] basé sur la propriété [{1}]
 requestFilterValve.next=Aucune Valve ''suivante'' n''a été configurée
-requestFilterValve.syntax=Erreur de syntaxe dans le pattern de filtre de requête {0}
+requestFilterValve.syntax=Erreur de syntaxe dans le pattern de filtre de requête [{0}]
 
 sslValve.certError=Impossible de traiter le certificat [{0}] pour créer un objet java.security.cert.X509Certificate
 sslValve.invalidProvider=Le fournisseur SSL spécifié pour le connecteur associé avec cette requête de [{0}] est invalide, le certificat n''a pas pu être traité
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 3b486bf..b1fd023 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -117,7 +117,7 @@ http.511.reason=Network Authentication Required
 jdbcAccessLogValve.close=データベースのクローズに失敗しました。
 jdbcAccessLogValve.exception=アクセスエントリの挿入を実行中の例外です
 
-remoteCidrValve.invalid="[{0}]" に不正な値が指定されました。詳細は前のメッセージを参照してください。
+remoteCidrValve.invalid=[{0}] に不正な値が指定されました。詳細は前のメッセージを参照してください。
 remoteCidrValve.noRemoteIp=クライアントの IP アドレスを取得できません。リクエストを拒否します。
 
 remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番号 [{0}] が指定されました。
@@ -125,7 +125,7 @@ remoteIpValve.invalidPortHeader=HTTP ヘッダー [{1}] に不正なポート番
 requestFilterValve.configInvalid=Valveとその親コンテナの起動を妨げたRemote [Addr | Host] Valveに1つ以上の無効な構成設定が提供されました。
 requestFilterValve.deny=プロパティ [{1}] により [{0}] へのリクエストを拒否しました。
 requestFilterValve.next=次のバルブが設定されていません
-requestFilterValve.syntax=リクエストフィルタパターン {0} に構文エラーがあります
+requestFilterValve.syntax=リクエストフィルタパターン [{0}] に構文エラーがあります
 
 sslValve.certError=java.security.cert.X509Certificateオブジェクトを作成するための証明書文字列[{0}]を処理を失敗しました。
 sslValve.invalidProvider=リクエスト [{0}] に関連付けられたコネクターへ不正な SSL プロバイダーが構成されています。証明書データを処理できません。
diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties b/java/org/apache/coyote/ajp/LocalStrings.properties
index ab2942a..b725b79 100644
--- a/java/org/apache/coyote/ajp/LocalStrings.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings.properties
@@ -19,7 +19,7 @@ ajpmessage.invalid=Invalid message received with signature [{0}]
 ajpmessage.invalidLength=Invalid message received with length [{0}]
 ajpmessage.null=Cannot append null value
 ajpmessage.overflow=Overflow error for buffer adding [{0}] bytes at position [{1}]
-ajpmessage.read=Requested {0} bytes exceeds message available data
+ajpmessage.read=Requested [{0}] bytes exceeds message available data
 
 ajpprocessor.certs.fail=Certificate conversion failed
 ajpprocessor.comet.notsupported=The Comet protocol is not supported by this connector
@@ -36,6 +36,6 @@ ajpprocessor.ssl.notsupported=The SSL protocol is not supported by this connecto
 
 ajpprotocol.endpoint.starterror=Error starting endpoint
 ajpprotocol.failedwrite=Socket write failed
-ajpprotocol.init=Initializing Coyote AJP/1.3 on {0}
+ajpprotocol.init=Initializing Coyote AJP/1.3 on [{0}]
 ajpprotocol.request.register=Error registering request processor in JMX
-ajpprotocol.start=Starting Coyote AJP/1.3 on {0}
+ajpprotocol.start=Starting Coyote AJP/1.3 on [{0}]
diff --git a/java/org/apache/coyote/ajp/LocalStrings_es.properties b/java/org/apache/coyote/ajp/LocalStrings_es.properties
index 52473e6..198e5da 100644
--- a/java/org/apache/coyote/ajp/LocalStrings_es.properties
+++ b/java/org/apache/coyote/ajp/LocalStrings_es.properties
@@ -16,7 +16,7 @@
 ajpmessage.invalid=Mensaje inválido recibido con firma [{0}]
 ajpmessage.null=No puedo añadir valor nulo
 ajpmessage.overflow=Error de desbordamiento en búfer al añadir [{0}] bytes en posición [{1}]
-ajpmessage.read=Los {0} bytes requeridos exceden los datos disponibles de mensaje
+ajpmessage.read=Los [{0}] bytes requeridos exceden los datos disponibles de mensaje
 
 ajpprocessor.certs.fail=Fallo en conversión de Certificado
 ajpprocessor.failedflush=No pude vaciar mensaje AJP
@@ -29,7 +29,7 @@ ajpprocessor.socket.info=Excepción obteniendo información de conector
 
 ajpprotocol.endpoint.starterror=Error arrancando punto final
 ajpprotocol.failedwrite=Fallo en escritura de Conector
-ajpprotocol.init=Inicializando Coyote AJP/1.3 en {0}
+ajpprotocol.init=Inicializando Coyote AJP/1.3 en [{0}]
 ajpprotocol.proto.error=Error leyendo requerimiento, ignorado
 ajpprotocol.request.register=Error registrando procesador de requerimiento en JMX
-ajpprotocol.start=Arrancando Coyote AJP/1.3 en {0}
+ajpprotocol.start=Arrancando Coyote AJP/1.3 en [{0}]
diff --git a/java/org/apache/coyote/http11/LocalStrings.properties b/java/org/apache/coyote/http11/LocalStrings.properties
index 36d797a..7f3eb7e 100644
--- a/java/org/apache/coyote/http11/LocalStrings.properties
+++ b/java/org/apache/coyote/http11/LocalStrings.properties
@@ -18,11 +18,11 @@ http11Processor.upgrade=An internal error has occurred as upgraded connections s
 http11processor.comet.notsupported=The Comet protocol is not supported by this connector
 http11processor.fallToDebug=\n\
 \ Note: further occurrences of HTTP request parsing errors will be logged at DEBUG level.
-http11processor.filter.error=Error intializing filter {0}
-http11processor.filter.unknown=Unknown filter {0}
+http11processor.filter.error=Error intializing filter [{0}]
+http11processor.filter.unknown=Unknown filter [{0}]
 http11processor.header.parse=Error parsing HTTP request header
 http11processor.neverused=This method should never be used
-http11processor.regexp.error=Error parsing regular expression {0}
+http11processor.regexp.error=Error parsing regular expression [{0}]
 http11processor.request.finish=Error finishing request
 http11processor.request.inconsistentHosts=The host specified in the request line is not consistent with the host header
 http11processor.request.invalidScheme=The HTTP request contained an absolute URI with an invalid scheme
@@ -47,7 +47,7 @@ http11protocol.proto.ioexception.debug=IOException reading request
 http11protocol.proto.ioexception.info=IOException reading request, ignored
 http11protocol.proto.socketexception.debug=SocketException reading request
 http11protocol.proto.socketexception.info=SocketException reading request, ignored
-http11protocol.start=Starting Coyote HTTP/1.1 on {0}
+http11protocol.start=Starting Coyote HTTP/1.1 on [{0}]
 
 iib.apr.sslGeneralError=An APR general error was returned by the SSL read operation on APR/native socket [{0}] with wrapper [{1}]. It will be treated as EAGAIN and the socket returned to the poller.
 iib.eof.error=Unexpected EOF read on the socket
diff --git a/java/org/apache/coyote/http11/LocalStrings_es.properties b/java/org/apache/coyote/http11/LocalStrings_es.properties
index 225bdf0..10992e0 100644
--- a/java/org/apache/coyote/http11/LocalStrings_es.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_es.properties
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-http11processor.filter.error=Error inicializando filtro {0}
-http11processor.filter.unknown=Filtro desconocido {0}
+http11processor.filter.error=Error inicializando filtro [{0}]
+http11processor.filter.unknown=Filtro desconocido [{0}]
 http11processor.header.parse=Error analizando cabecera de requerimiento HTTP
 http11processor.neverused=Este método no debería de usarse nunca
-http11processor.regexp.error=Error al analizar expresión regular {0}
+http11processor.regexp.error=Error al analizar expresión regular [{0}]
 http11processor.request.finish=Error acabando requerimiento
 http11processor.request.prepare=Error preparando solicitud
 http11processor.request.process=Error procesando requerimiento
@@ -33,7 +33,7 @@ http11protocol.proto.ioexception.debug=IOException leyendo requerimiento
 http11protocol.proto.ioexception.info=IOException leyendo requerimiento, ignorada
 http11protocol.proto.socketexception.debug=SocketException leyendo requerimiento
 http11protocol.proto.socketexception.info=SocketException leyendo requerimiento, ignorada
-http11protocol.start=Arrancando Coyote HTTP/1.1 en puerto {0}
+http11protocol.start=Arrancando Coyote HTTP/1.1 en puerto [{0}]
 
 iib.eof.error=Inesperado Fin De Archivo (EOF) leído en el enchufe (socket)
 iib.invalidmethod=Se encontró un carácter inválido en el nombre del método. Los nombres de métodos HTTP deben ser tokens
diff --git a/java/org/apache/coyote/http11/LocalStrings_fr.properties b/java/org/apache/coyote/http11/LocalStrings_fr.properties
index 15c7d5d..b46276c 100644
--- a/java/org/apache/coyote/http11/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_fr.properties
@@ -35,7 +35,7 @@ http11protocol.proto.ioexception.debug=Exception d'entrée/sortie (IOException)
 http11protocol.proto.ioexception.info=Exception d'entrée/sortie à la lecture de la requête, ignoré
 http11protocol.proto.socketexception.debug=Exception "Socket" (SocketException) à la lecture de la requête
 http11protocol.proto.socketexception.info=Exception "Socket" (SocketException) à la lecture de la requête, ignoré
-http11protocol.start=Démarrage de Coyote HTTP/1.1 sur {0}
+http11protocol.start=Démarrage de Coyote HTTP/1.1 sur [{0}]
 
 iib.eof.error=Fin de flux (EOF) inattendue à la lecture sur la socket
 iib.invalidHttpProtocol=Un caractère invalide a été trouvé dans le protocole HTTP
diff --git a/java/org/apache/coyote/http11/LocalStrings_ja.properties b/java/org/apache/coyote/http11/LocalStrings_ja.properties
index e65fdbd..5e9567d 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ja.properties
@@ -35,7 +35,7 @@ http11protocol.proto.ioexception.debug=リクエストを読み込み中のIOExc
 http11protocol.proto.ioexception.info=リクエストを読み込み中のIOExceptionですが、無視されました
 http11protocol.proto.socketexception.debug=リクエストを読み込み中のSocketExceptionです
 http11protocol.proto.socketexception.info=リクエストを読み込み中のSocketExceptionですが、無視されました
-http11protocol.start=Coyote HTTP/1.1を {0} で起動します
+http11protocol.start=Coyote HTTP/1.1を [{0}] で起動します
 
 iib.eof.error=ソケットから予期しないEOFを読み込みました
 iib.invalidHttpProtocol=HTTPプロトコルで無効な文字が見つかりました。
diff --git a/java/org/apache/el/Messages.properties b/java/org/apache/el/Messages.properties
index 5408c7d..20634ad 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -14,23 +14,23 @@
 # limitations under the License.
 
 # General Errors
-error.convert=Cannot convert {0} of type {1} to {2}
-error.compare=Cannot compare {0} to {1}
-error.function=Problems calling function ''{0}''
-error.unreachable.base=Target Unreachable, identifier ''{0}'' resolved to null
-error.unreachable.property=Target Unreachable, ''{0}'' returned null
-error.resolver.unhandled=ELResolver did not handle type: {0} with property of ''{1}''
-error.resolver.unhandled.null=ELResolver cannot handle a null base Object with identifier ''{0}''
+error.convert=Cannot convert [{0}] of type [{1}] to [{2}]
+error.compare=Cannot compare [{0}] to [{1}]
+error.function=Problems calling function [{0}]
+error.unreachable.base=Target Unreachable, identifier [{0}] resolved to null
+error.unreachable.property=Target Unreachable, [{0}] returned null
+error.resolver.unhandled=ELResolver did not handle type: [{0}] with property of [{1}]
+error.resolver.unhandled.null=ELResolver cannot handle a null base Object with identifier [{0}]
 error.invoke.wrongParams=The method [{0}] was called with [{1}] parameter(s) when it expected [{2}]
 error.invoke.tooFewParams=The method [{0}] was called with [{1}] parameter(s) when it expected at least [{2}]
 
 # ValueExpressionLiteral
-error.value.literal.write=ValueExpression is a literal and not writable: {0}
+error.value.literal.write=ValueExpression is a literal and not writable: [{0}]
 
 # ExpressionFactoryImpl
 error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{..}' and '${..}' : {0}
-error.method=Not a valid MethodExpression : {0}
+error.mixed=Expression cannot contain both '#{..}' and '${..}' : [{0}]
+error.method=Not a valid MethodExpression : [{0}]
 error.method.nullParms=Parameter types cannot be null
 error.value.expectedType=Expected type cannot be null
 
@@ -38,7 +38,7 @@ error.value.expectedType=Expected type cannot be null
 error.parseFail=Failed to parse the expression [{0}]
 
 # ExpressionMediator
-error.eval=Error Evaluating {0} : {1}
+error.eval=Error Evaluating [{0}] : [{1}]
 
 # ValueSetVisitor
 error.syntax.set=Illegal Syntax for Set Operation
@@ -46,27 +46,27 @@ error.syntax.set=Illegal Syntax for Set Operation
 # ReflectionUtil
 error.method.notfound=Method not found: {0}.{1}({2})
 error.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
-error.property.notfound=Property ''{1}'' not found on {0}
+error.property.notfound=Property [{1}] not found on [{0}]
 
 # ValidatingVisitor
 error.fnMapper.null=Expression uses functions, but no FunctionMapper was provided
-error.fnMapper.method=Function ''{0}'' not found
-error.fnMapper.paramcount=Function ''{0}'' specifies {1} params, but {2} were declared
+error.fnMapper.method=Function [{0}] not found
+error.fnMapper.paramcount=Function [{0}] specifies [{1}] params, but [{2}] were declared
 
 # ExpressionImpl
 error.context.null=ELContext was null
 
 # ArrayELResolver
-error.array.outofbounds=Index {0} is out of bounds for array of size {1}
+error.array.outofbounds=Index [{0}] is out of bounds for array of size [{1}]
 
 # ListELResolver
-error.list.outofbounds=Index {0} is out of bounds for list of size {1}
+error.list.outofbounds=Index [{0}] is out of bounds for list of size [{1}]
 
 # BeanELResolver
-error.property.notfound=Property ''{1}'' not found on type: {0}
-error.property.invocation=Property ''{1}'' threw an exception from type: {0}
-error.property.notreadable=Property ''{1}'' doesn''t have a ''get'' specified on type: {0}
-error.property.notwritable=Property ''{1}'' doesn''t have a ''set'' specified on type: {0}
+error.property.notfound=Property [{1}] not found on type: [{0}]
+error.property.invocation=Property [{1}] threw an exception from type: [{0}]
+error.property.notreadable=Property [{1}] doesn''t have a ''get'' specified on type: [{0}]
+error.property.notwritable=Property [{1}] doesn''t have a ''set'' specified on type: [{0}]
 
 # Parser
 error.identifier.notjava=The identifier [{0}] is not a valid Java identifier as required by section 1.19 of the EL specification (Identifier ::= Java language identifier). This check can be disabled by setting the system property org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
\ No newline at end of file
diff --git a/java/org/apache/el/Messages_es.properties b/java/org/apache/el/Messages_es.properties
index 23e69e6..aa16429 100644
--- a/java/org/apache/el/Messages_es.properties
+++ b/java/org/apache/el/Messages_es.properties
@@ -13,31 +13,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-error.convert = No puedo convertir {0} desde tipo {1} a {2}
-error.compare = No puedo comparar {0} con {1}
-error.function = Problemas llamando a funci\u00F3n ''{0}''
-error.unreachable.base = Objetivo inalcanzable, identificador ''{0}'' resuelto a nulo
-error.unreachable.property = Objetivo inalcanzable, ''{0}'' devolvi\u00F3 nulo
-error.resolver.unhandled = ELResolver no manej\u00F3 el tipo\: {0} con propiedad de ''{1}''
-error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base nulo  con identificador de ''{0}''
-error.value.literal.write = ValueExpression es un literal y no un grabable\: {0}
+error.convert = No puedo convertir [{0}] desde tipo [{1}] a [{2}]
+error.compare = No puedo comparar [{0}] con [{1}]
+error.function = Problemas llamando a funci\u00F3n [{0}]
+error.unreachable.base = Objetivo inalcanzable, identificador [{0}] resuelto a nulo
+error.unreachable.property = Objetivo inalcanzable, [{0}] devolvi\u00F3 nulo
+error.resolver.unhandled = ELResolver no manej\u00F3 el tipo\: [{0}] con propiedad de [{1}]
+error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base nulo  con identificador de [{0}]
+error.value.literal.write = ValueExpression es un literal y no un grabable\: [{0}]
 error.null = La expresi\u00F3n no puede ser nula
-error.mixed = La expresi\u00F3n no puede contenera la vez '#{...}' y '${...}' : {0}
-error.method = No es una MethodExpression v\u00E1lida\: {0}
+error.mixed = La expresi\u00F3n no puede contenera la vez '#{...}' y '${...}' : [{0}]
+error.method = No es una MethodExpression v\u00E1lida\: [{0}]
 error.method.nullParms = Los tipos de par\u00E1metro no pueden ser nulo
 error.value.expectedType = El tipo esperado no puede ser nulo
-error.eval = Error Evaluando {0} \: {1}
+error.eval = Error Evaluando [{0}] \: [{1}]
 error.syntax.set = Sit\u00E1xis ilegal para Operaci\u00F3n de Poner Valor
 error.method.notfound = M\u00E9todo no hallado\: {0}.{1}({2})
 error.method.ambiguous = No pude hallar m\u00E9todo ambiguo\: {0}.{1}({2})
-error.property.notfound = Propiedad ''{1}'' no hallada en tipo\: {0}
+error.property.notfound = Propiedad [{1}] no hallada en tipo\: [{0}]
 error.fnMapper.null = La expresi\u00F3n usa funciones, pero no se ha suministrado FunctionMapper
-error.fnMapper.method = Funci\u00F3n "{0}" no hallada
-error.fnMapper.paramcount = La funci\u00F3n ''{0}'' especifica {1} par\u00E9metros, pero {2} fueron declarados
+error.fnMapper.method = Funci\u00F3n [{0}] no hallada
+error.fnMapper.paramcount = La funci\u00F3n [{0}] especifica [{1}] par\u00E9metros, pero [{2}] fueron declarados
 error.context.null = ELContext era nulo
-error.array.outofbounds = \u00CDndice {0} fuera de l\u00EDmites para arreglo de medida {1}
-error.list.outofbounds = \u00CDndice {0} fuera de l\u00EDmites para lista de medida {1}
-error.property.invocation = Propiedad ''{1}'' lanz\u00F3 una excepci\u00F3n desde tipo\: {0}
-error.property.notreadable = La propiedad ''{1}'' no tiene un ''get'' especificado en el tipo\: {0}
-error.property.notwritable = La propiedad ''{1}'' no tiene un ''set'' especificado en el tipo\: {0}
+error.array.outofbounds = \u00CDndice [{0}] fuera de l\u00EDmites para arreglo de medida [{1}]
+error.list.outofbounds = \u00CDndice [{0}] fuera de l\u00EDmites para lista de medida [{1}]
+error.property.invocation = Propiedad [{1}] lanz\u00F3 una excepci\u00F3n desde tipo\: [{0}]
+error.property.notreadable = La propiedad [{1}] no tiene un ''get'' especificado en el tipo\: [{0}]
+error.property.notwritable = La propiedad [{1}] no tiene un ''set'' especificado en el tipo\: [{0}]
 error.identifier.notjava = El identificador [{0}] no es un identificado Java v\u00E1lido seg\u00FAn se requiere en la secci\u00F3n 1.9 de la especificaci\u00F3n EL (Identificador \:\:\= identificador de lenguaje Java). Este chequeo se puede desactivar poniendo la propiedad del sistema  org.apache.el.parser.SKIP_IDENTIFIER_CHECK a verdad (true).
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index b9132dd..d21d377 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -35,7 +35,7 @@ jsp.error.bad.scratch.dir=The scratchDir you specified: [{0}] is unusable.
 jsp.error.badStandardAction=Invalid standard action
 jsp.error.bad_attribute=Attribute [{0}] invalid for tag [{1}] according to TLD
 jsp.error.bad_tag=No tag [{0}] defined in tag library imported with prefix [{1}]
-jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type ''{0}'' could be found, the class likely does not exist.
+jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type [{0}] could be found, the class likely does not exist.
 jsp.error.beans.nomethod=Cannot find a method to read property [{0}] in a bean of type [{1}]
 jsp.error.beans.nomethod.setproperty=Cannot find a method to write property [{0}] of type [{1}] in a bean of type [{2}]
 jsp.error.beans.noproperty=Cannot find any information on property [{0}] in a bean of type [{1}]
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 85f099d..0497c16 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -35,7 +35,7 @@ jsp.error.bad.scratch.dir=El directorio de trabajo especificado: [{0}] no es uti
 jsp.error.badStandardAction=Acción estándar incorrecta
 jsp.error.bad_attribute=El atributo [{0}] no es válido según el TLD especificado
 jsp.error.bad_tag=No existe el tag [{0}] en la biblioteca importada con prefijo [{1}]
-jsp.error.beans.nobeaninfo=No se puede encontrar BeanInfo para el bean  ''{0}'' seguramente la clase no existe
+jsp.error.beans.nobeaninfo=No se puede encontrar BeanInfo para el bean  [{0}] seguramente la clase no existe
 jsp.error.beans.nomethod=No puedo encontrar un método para leer la propiedad [{0}] en un bean del tipo [{1}]
 jsp.error.beans.nomethod.setproperty=No puedo encontrar un método para escribir la propiedad [{0}] en un bean del tipo [{2}]
 jsp.error.beans.noproperty=No puedo encontrar información de la propiedad [{0}] en un bean del tipo [{1}]
diff --git a/java/org/apache/naming/resources/LocalStrings.properties b/java/org/apache/naming/resources/LocalStrings.properties
index 4264ead..597ee08 100644
--- a/java/org/apache/naming/resources/LocalStrings.properties
+++ b/java/org/apache/naming/resources/LocalStrings.properties
@@ -15,38 +15,38 @@
 
 classpathUrlStreamHandler.notFound=Unable to load the resource [{0}] using the thread context class loader or the current class''s class loader
 
-fileResources.base=Document base {0} does not exist or is not a readable directory
+fileResources.base=Document base [{0}] does not exist or is not a readable directory
 fileResources.canonical.fail=A canonical path could not be determined for [{0}]
-fileResources.listingNull=Could not get dir listing for {0}
+fileResources.listingNull=Could not get dir listing for [{0}]
 
-jarResources.syntax=Document base {0} must start with ''jar:'' and end with ''!/''
+jarResources.syntax=Document base [{0}] must start with ''jar:'' and end with ''!/''
 
 resources.addResourcesJarFail=Failed to add resources jar [{0}]
-resources.alreadyBound=Name {0} is already bound in this Context
+resources.alreadyBound=Name [{0}] is already bound in this Context
 resources.alreadyStarted=Resources has already been started
-resources.bindFailed=Bind failed: {0}
-resources.connect=Cannot connect to document base {0}
-resources.input=Cannot create input stream for resource {0}
-resources.invalidAliasFile=The alias location ''{0}'' points to a file that is not a WAR file
-resources.invalidAliasMapping=The alias mapping ''{0}'' is not valid
-resources.invalidAliasNotAllowed=The alias location ''{0}'' is not allowed
-resources.invalidAliasNotExist=The alias location ''{0}'' does not exist
-resources.invalidAliasPath=The alias path ''{0}'' must start with ''/''
+resources.bindFailed=Bind failed: [{0}]
+resources.connect=Cannot connect to document base [{0}]
+resources.input=Cannot create input stream for resource [{0}]
+resources.invalidAliasFile=The alias location [{0}] points to a file that is not a WAR file
+resources.invalidAliasMapping=The alias mapping [{0}] is not valid
+resources.invalidAliasNotAllowed=The alias location [{0}] is not allowed
+resources.invalidAliasNotExist=The alias location [{0}] does not exist
+resources.invalidAliasPath=The alias path [{0}] must start with ''/''
 resources.invalidCache=Unable to create a resource cache of type [{0}]
 resources.invalidName=The name [{0}] is not valid
-resources.notFound=Resource {0} not found
+resources.notFound=Resource [{0}] not found
 resources.notStarted=Resources has not yet been started
 resources.null=Document base cannot be null
-resources.path=Context relative path {0} must start with ''/''
+resources.path=Context relative path [{0}] must start with ''/''
 resources.renameFail=Failed to rename [{0}] to [{1}]
-resources.unbindFailed=Unbind failed: {0}
+resources.unbindFailed=Unbind failed: [{0}]
 
 standardResources.alreadyStarted=Resources has already been started
-standardResources.directory=File base {0} is not a directory
-standardResources.exists=File base {0} does not exist
+standardResources.directory=File base [{0}] is not a directory
+standardResources.exists=File base [{0}] does not exist
 standardResources.notStarted=Resources has not yet been started
 standardResources.null=Document base cannot be null
-standardResources.slash=Document base {0} must not end with a slash
+standardResources.slash=Document base [{0}] must not end with a slash
 
-warResources.invalidWar=Invalid or unreadable WAR file : {0}
+warResources.invalidWar=Invalid or unreadable WAR file : [{0}]
 warResources.notWar=Doc base must point to a WAR file
diff --git a/java/org/apache/naming/resources/LocalStrings_es.properties b/java/org/apache/naming/resources/LocalStrings_es.properties
index 3ea7fca..75679a4 100644
--- a/java/org/apache/naming/resources/LocalStrings_es.properties
+++ b/java/org/apache/naming/resources/LocalStrings_es.properties
@@ -13,37 +13,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileResources.base=El Documento base {0} no existe o no es un directorio legible
-fileResources.listingNull=No pude obtener lista de directorio para {0}
+fileResources.base=El Documento base [{0}] no existe o no es un directorio legible
+fileResources.listingNull=No pude obtener lista de directorio para [{0}]
 
-jarResources.syntax=Documento base {0} debe de empezar con ''jar:'' y acabar con ''!/''
+jarResources.syntax=Documento base [{0}] debe de empezar con ''jar:'' y acabar con ''!/''
 
 resources.addResourcesJarFail=No pude añadir jar de recursos [{0}]
-resources.alreadyBound=El Nombre {0} ya ha sido cambiado (bound) en este Contexto
+resources.alreadyBound=El Nombre [{0}] ya ha sido cambiado (bound) en este Contexto
 resources.alreadyStarted=Ya han sido arrancados los Recursos
-resources.bindFailed=Falló el Cambio (Bind): {0}
-resources.connect=No puedo conectar a documento base {0}
-resources.input=No puedo crear flujo (stream) de entrada para recurso {0}
-resources.invalidAliasFile=La localización de alias ''{0}'' apunta a un fichero que no es de tipo WAR
-resources.invalidAliasMapping=El mapeo de alias ''{0}'' no es válido
-resources.invalidAliasNotAllowed=La localización de alias ''{0}'' no está permitida
-resources.invalidAliasNotExist=La localización de alias ''{0}'' no existe
-resources.invalidAliasPath=La ruta de alias ''{0}'' debe de comenzar con ''/''
+resources.bindFailed=Falló el Cambio (Bind): [{0}]
+resources.connect=No puedo conectar a documento base [{0}]
+resources.input=No puedo crear flujo (stream) de entrada para recurso [{0}]
+resources.invalidAliasFile=La localización de alias [{0}] apunta a un fichero que no es de tipo WAR
+resources.invalidAliasMapping=El mapeo de alias [{0}] no es válido
+resources.invalidAliasNotAllowed=La localización de alias [{0}] no está permitida
+resources.invalidAliasNotExist=La localización de alias [{0}] no existe
+resources.invalidAliasPath=La ruta de alias [{0}] debe de comenzar con ''/''
 resources.invalidCache=No pude crear una caché de recursos de tipo [{0}]
 resources.invalidName=El nombre [{0}] no es válido
-resources.notFound=Recurso {0} no hallado
+resources.notFound=Recurso [{0}] no hallado
 resources.notStarted=Aún no han sido arrancados los Recursos
 resources.null=El Documento base no puede ser nulo
-resources.path=Trayectoria relativa a contexto {0} debe de comenzar con ''/''
+resources.path=Trayectoria relativa a contexto [{0}] debe de comenzar con ''/''
 resources.renameFail=No pude cambiar de nombre [{0}] a [{1}]
-resources.unbindFailed=Falló el Descambio (Unbind): {0}
+resources.unbindFailed=Falló el Descambio (Unbind): [{0}]
 
 standardResources.alreadyStarted=Ya han sido arrancados los Recursos
-standardResources.directory=El archivo base {0} no es un directorio
-standardResources.exists=El archivo base {0} no existe
+standardResources.directory=El archivo base [{0}] no es un directorio
+standardResources.exists=El archivo base [{0}] no existe
 standardResources.notStarted=Aún no han sido arrancados los Recursos
 standardResources.null=El Documento base no puede ser nulo
-standardResources.slash=El Documento base {0} no debe de terminar con una barra
+standardResources.slash=El Documento base [{0}] no debe de terminar con una barra
 
-warResources.invalidWar=Archivo WAR inválido o ilegible: {0}
+warResources.invalidWar=Archivo WAR inválido o ilegible: [{0}]
 warResources.notWar=Doc base debe de apuntar a un archivo WAR
diff --git a/java/org/apache/naming/resources/LocalStrings_fr.properties b/java/org/apache/naming/resources/LocalStrings_fr.properties
index 8d56d16..d03d552 100644
--- a/java/org/apache/naming/resources/LocalStrings_fr.properties
+++ b/java/org/apache/naming/resources/LocalStrings_fr.properties
@@ -13,27 +13,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileResources.base=Le document base {0} n''existe pas ou n''est pas un répertoire lisible
+fileResources.base=Le document base [{0}] n''existe pas ou n''est pas un répertoire lisible
 
-jarResources.syntax=Le document base {0} doit commencer par ''jar:'' et finir avec ''!/''
+jarResources.syntax=Le document base [{0}] doit commencer par ''jar:'' et finir avec ''!/''
 
-resources.alreadyBound=Le nom {0} est déjà référencé par ce contexte
+resources.alreadyBound=Le nom [{0}] est déjà référencé par ce contexte
 resources.alreadyStarted=Les Ressources ont déjà été démarrées
-resources.bindFailed=Le liage a échoué: {0}
-resources.connect=Impossible de se connecter au document base {0}
-resources.input=Impossible de créer l''input stream pour la ressource {0}
-resources.notFound=La ressource {0} est introuvable
+resources.bindFailed=Le liage a échoué: [{0}]
+resources.connect=Impossible de se connecter au document base [{0}]
+resources.input=Impossible de créer l''input stream pour la ressource [{0}]
+resources.notFound=La ressource [{0}] est introuvable
 resources.notStarted=Les ressources n''ont pas encore été démarrées
 resources.null=Le document base ne peut être nul
-resources.path=Le chemin relatif de context {0} doit commencer par ''/''
-resources.unbindFailed=Le déliage a échoué: {0}
+resources.path=Le chemin relatif de context [{0}] doit commencer par ''/''
+resources.unbindFailed=Le déliage a échoué: [{0}]
 
 standardResources.alreadyStarted=Les ressources ont déja été démarrées
-standardResources.directory=Le file base {0} n''est pas un répertoire
-standardResources.exists=Le file base {0} n''existe pas
+standardResources.directory=Le file base [{0}] n''est pas un répertoire
+standardResources.exists=Le file base [{0}] n''existe pas
 standardResources.notStarted=Les ressources n''ont pas encore été démarrées
 standardResources.null=Le document base ne peut être nul
-standardResources.slash=Le document base {0} ne doit pas se terminer par un ''/''
+standardResources.slash=Le document base [{0}] ne doit pas se terminer par un ''/''
 
-warResources.invalidWar=Fichier WAR invalide ou illisible  : {0}
+warResources.invalidWar=Fichier WAR invalide ou illisible  : [{0}]
 warResources.notWar=Doc base doit pointé vers un fichier WAR
diff --git a/java/org/apache/naming/resources/LocalStrings_ja.properties b/java/org/apache/naming/resources/LocalStrings_ja.properties
index dc3ccb8..4fdd5aa 100644
--- a/java/org/apache/naming/resources/LocalStrings_ja.properties
+++ b/java/org/apache/naming/resources/LocalStrings_ja.properties
@@ -13,28 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileResources.base=ドキュメントベース {0} が存在しない、又は読めないディレクトリです
-fileResources.listingNull={0} のディレクトリのリストを取得できません
+fileResources.base=ドキュメントベース [{0}] が存在しない、又は読めないディレクトリです
+fileResources.listingNull=[{0}] のディレクトリのリストを取得できません
 
-jarResources.syntax=ドキュメントベース {0} は''jar:''で始まり、''!/''で終らなければいけません
+jarResources.syntax=ドキュメントベース [{0}] は''jar:''で始まり、''!/''で終らなければいけません
 
-resources.alreadyBound=名前 {0} は既にこのコンテキストにバインドされています
+resources.alreadyBound=名前 [{0}] は既にこのコンテキストにバインドされています
 resources.alreadyStarted=リソースは既に起動されています
-resources.bindFailed=バインドが失敗しました: {0}
-resources.connect=ドキュメントベース {0} に接続できません
-resources.input=リソース {0} に入力ストリームを作成できません
-resources.notFound=リソース {0} が見つかりません
+resources.bindFailed=バインドが失敗しました: [{0}]
+resources.connect=ドキュメントベース [{0}] に接続できません
+resources.input=リソース [{0}] に入力ストリームを作成できません
+resources.notFound=リソース [{0}] が見つかりません
 resources.notStarted=リソースはまだ起動されていません
 resources.null=ドキュメントベースはnullであってはいけません
-resources.path=コンテキスト相対パス {0} は''/''で始まらなければいけません
-resources.unbindFailed=アンバインドが失敗しました: {0}
+resources.path=コンテキスト相対パス [{0}] は''/''で始まらなければいけません
+resources.unbindFailed=アンバインドが失敗しました: [{0}]
 
 standardResources.alreadyStarted=リソースは既に起動されています
-standardResources.directory=ファイルベース {0} はディレクトリではありません
-standardResources.exists=ファイルベース {0} は存在しません
+standardResources.directory=ファイルベース [{0}] はディレクトリではありません
+standardResources.exists=ファイルベース [{0}] は存在しません
 standardResources.notStarted=リソースがまだ起動されていません
 standardResources.null=ドキュメントベースはnullであってはいけません
-standardResources.slash=ドキュメントベース {0} はスラッシュで終ってはいけません
+standardResources.slash=ドキュメントベース [{0}] はスラッシュで終ってはいけません
 
-warResources.invalidWar=無効又は読めないWARファイルです : {0}
+warResources.invalidWar=無効又は読めないWARファイルです : [{0}]
 warResources.notWar=ドキュメントベースはWARファイルを示さなければいけません
diff --git a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
index 353d7e6..1480048 100644
--- a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
@@ -15,23 +15,23 @@
 
 jseeSupport.certTranslationError=Error translating certificate [{0}]
 
-jsse.alias_no_key_entry=Alias name {0} does not identify a key entry
-jsse.enableable_ciphers=Specified SSL ciphers that are supported and enableable are : {0}
-jsse.enableable_protocols=Specified SSL protocols that are supported and enableable are : {0}
+jsse.alias_no_key_entry=Alias name [{0}] does not identify a key entry
+jsse.enableable_ciphers=Specified SSL ciphers that are supported and enableable are : [{0}]
+jsse.enableable_protocols=Specified SSL protocols that are supported and enableable are : [{0}]
 jsse.exceptionOnClose=Failure to close socket.
 jsse.excludeDefaultCipher=The SSL cipher [{0}] which is enabled by default in this JRE was excluded from the defaults used by Tomcat
 jsse.excludeDefaultProtocol=The SSL protocol [{0}] which is enabled by default in this JRE was excluded from the defaults used by Tomcat
 jsse.invalidTrustManagerClassName=The trustManagerClassName provided [{0}] does not implement javax.net.ssl.TrustManager
-jsse.invalid_ssl_conf=SSL configuration is invalid due to {0}
+jsse.invalid_ssl_conf=SSL configuration is invalid due to [{0}]
 jsse.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.
 jsse.java6.emptyPass=The PKCS12 key store does not support the use of the empty string as a password on Java 6.
-jsse.keystore_load_failed=Failed to load keystore type {0} with path {1} due to {2}
+jsse.keystore_load_failed=Failed to load keystore type [{0}] with path [{1}] due to [{2}]
 jsse.noDefaultCiphers=Unable to determine a default for ciphers for [{0}]. Set an explicit value to ensure the connector can start.
 jsse.noDefaultProtocols=Unable to determine a default for sslEnabledProtocols for [{0}]. Set an explicit value to ensure the connector can start.
-jsse.requested_ciphers_not_supported=None of the ciphers specified are supported by the SSL engine : {0}
-jsse.requested_protocols_not_supported=None of the SSL protocols specified are supported by the SSL engine : {0}
-jsse.unsupported_ciphers=Some specified SSL ciphers are not supported by the SSL engine : {0}
-jsse.unsupported_protocols=Some specified SSL protocols are not supported by the SSL engine : {0}
+jsse.requested_ciphers_not_supported=None of the ciphers specified are supported by the SSL engine : [{0}]
+jsse.requested_protocols_not_supported=None of the SSL protocols specified are supported by the SSL engine : [{0}]
+jsse.unsupported_ciphers=Some specified SSL ciphers are not supported by the SSL engine : [{0}]
+jsse.unsupported_protocols=Some specified SSL protocols are not supported by the SSL engine : [{0}]
 
 jsseSupport.clientCertError=Error trying to obtain a certificate from the client
 jsseSupport.noCertWant=No client certificate sent for want
diff --git a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
index 31e0603..e200a7e 100644
--- a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsse.alias_no_key_entry=El nombre de Alias {0} no identifica una entrada de clave
+jsse.alias_no_key_entry=El nombre de Alias [{0}] no identifica una entrada de clave
 jsse.invalidTrustManagerClassName=El trustManagerClassName suministrado [{0}] no implementa  javax.net.ssl.TrustManager
-jsse.invalid_ssl_conf=La configuración SSL no es válida debido a {0}
+jsse.invalid_ssl_conf=La configuración SSL no es válida debido a [{0}]
 jsse.invalid_truststore_password=La clave del almacén de confianza suministrada no se pudo usar para desbloquear y/o validar el almacén de confianza. Reintentando acceder el almacén de confianza con una clave nula que se saltará la validación.
-jsse.keystore_load_failed=No pude cargar almacén de claves de tipo {0} con ruta {1} debido a {2}
+jsse.keystore_load_failed=No pude cargar almacén de claves de tipo [{0}] con ruta [{1}] debido a [{2}]
diff --git a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
index 46c6e41..19794bb 100644
--- a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsse.alias_no_key_entry=Le nom alias {0} n''identifie pas une entrée de clef
+jsse.alias_no_key_entry=Le nom alias [{0}] n''identifie pas une entrée de clef
diff --git a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
index 64e4b1b..27a5eee 100644
--- a/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jsse.alias_no_key_entry=別名 {0} はキーエントリを発見できません
+jsse.alias_no_key_entry=別名 [{0}] はキーエントリを発見できません
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings.properties b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
index 2d9cb56..5472039 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings.properties
@@ -37,12 +37,12 @@ endpoint.debug.pollerRemoved=Removed [{0}] from poller
 endpoint.debug.socket=socket [{0}]
 endpoint.debug.socketCloseFail=Failed to close socket
 endpoint.debug.socketTimeout=Timing out [{0}]
-endpoint.debug.unlock=Caught exception trying to unlock accept on port {0}
+endpoint.debug.unlock=Caught exception trying to unlock accept on port [{0}]
 endpoint.err.close=Caught exception trying to close socket
 endpoint.err.handshake=Handshake failed
 endpoint.err.unexpected=Unexpected error processing socket
-endpoint.init.bind=Socket bind failed: [{0}] {1}
-endpoint.init.listen=Socket listen failed: [{0}] {1}
+endpoint.init.bind=Socket bind failed: [{0}] [{1}]
+endpoint.init.listen=Socket listen failed: [{0}] [{1}]
 endpoint.init.notavail=APR not available
 endpoint.jsse.cannotHonorServerCipherOrder=Java Runtime does not support "useServerCipherSuitesOrder". You must use Java 8 or later to use this feature.
 endpoint.launch.fail=Failed to launch new runnable
@@ -51,16 +51,16 @@ endpoint.nio.stopLatchAwaitFail=The pollers did not stop within the expected tim
 endpoint.nio.stopLatchAwaitInterrupted=This thread was interrupted while waiting for the pollers to stop
 endpoint.nio.timeoutCme=Exception during processing of timeouts. The code has been checked repeatedly and no concurrent modification has been found. If you are able to repeat this error please open a Tomcat bug and provide the steps to reproduce.
 endpoint.poll.error=Unexpected poller error
-endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] {1}
+endpoint.poll.fail=Critical poller failure (restarting poller): [{0}] [{1}]
 endpoint.poll.initfail=Poller creation failed
-endpoint.poll.limitedpollsize=Failed to create poller with specified size of {0}
+endpoint.poll.limitedpollsize=Failed to create poller with specified size of [{0}]
 endpoint.process.fail=Error allocating socket processor
-endpoint.sendfile.addfail=Sendfile failure: [{0}] {1}
+endpoint.sendfile.addfail=Sendfile failure: [{0}] [{1}]
 endpoint.sendfile.error=Unexpected sendfile error
 endpoint.timeout.err=Error processing socket timeout
 endpoint.warn.executorShutdown=The executor associated with thread pool [{0}] has not fully shutdown. Some application threads may still be running.
-endpoint.warn.noDisableCompression=''Disable compression'' option is not supported by the SSL library {0}
+endpoint.warn.noDisableCompression=''Disable compression'' option is not supported by the SSL library [{0}]
 endpoint.warn.noExector=Failed to process socket [{0}] in state [{1}] because the executor had already been shutdown
-endpoint.warn.noHonorCipherOrder=''Honor cipher order'' option is not supported by the SSL library {0}
-endpoint.warn.noInsecureReneg=Secure re-negotiation is not supported by the SSL library {0}
+endpoint.warn.noHonorCipherOrder=''Honor cipher order'' option is not supported by the SSL library [{0}]
+endpoint.warn.noInsecureReneg=Secure re-negotiation is not supported by the SSL library [{0}]
 endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock. Forcing hard socket shutdown.
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties b/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
index 8c81763..08398fe 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
@@ -18,29 +18,29 @@ endpoint.apr.invalidSslProtocol=Se ha proporcionado un valor inválido [{0}] par
 endpoint.apr.noSslCertFile=El atribiuto del conector SSLCertificateFile debe de ser definido al usar SSL con APR
 endpoint.debug.channelCloseFail=No puede cerrar el canal
 endpoint.debug.socketCloseFail=No pude cerrar el enchufe (socket)
-endpoint.debug.unlock=Excepción cogida intentando desbloquear aceptación en puerto {0}
+endpoint.debug.unlock=Excepción cogida intentando desbloquear aceptación en puerto [{0}]
 endpoint.err.close=Excepción cogida intentando cerrar conector
-endpoint.err.fatal=Punto Final (Endpoint) {0} parado debido a excepción: {1}
+endpoint.err.fatal=Punto Final (Endpoint) [{0}] parado debido a excepción: [{1}]
 endpoint.err.handshake=Acuerdo fallido
-endpoint.err.nonfatal=El Punto Final (Endpoint) {0} ignoró excepción: {1}
-endpoint.err.socket=Error de conector causado por máquina remota {0}
+endpoint.err.nonfatal=El Punto Final (Endpoint) [{0}] ignoró excepción: [{1}]
+endpoint.err.socket=Error de conector causado por máquina remota [{0}]
 endpoint.err.unexpected=Error inesperado al procesar conector
-endpoint.info.maxThreads=El máximo número de hilos ({0}) creados para el conector con dirección {1} y puerto {2}
-endpoint.init.bind=Ligado de conector falló: [{0}] {1}
-endpoint.init.listen=Escucha de conector falló: [{0}] {1}
+endpoint.info.maxThreads=El máximo número de hilos [{0}] creados para el conector con dirección [{1}] y puerto [{2}]
+endpoint.init.bind=Ligado de conector falló: [{0}] [{1}]
+endpoint.init.listen=Escucha de conector falló: [{0}] [{1}]
 endpoint.init.notavail=APR no disponible
 endpoint.noProcessor=No hay procesadores - ¡hilo de trabajadir muerto!
 endpoint.poll.error=Error inesperado de encuestador
-endpoint.poll.fail=Fallo crítico de encuestador (reiniciando encuestador): [{0}] {1}
+endpoint.poll.fail=Fallo crítico de encuestador (reiniciando encuestador): [{0}] [{1}]
 endpoint.poll.initfail=Falló la creación del encuestador
-endpoint.poll.limitedpollsize=No pude crear encuestador de medida específica de {0}
+endpoint.poll.limitedpollsize=No pude crear encuestador de medida específica de [{0}]
 endpoint.process.fail=Error reservando procesador de conector
-endpoint.sendfile.addfail=Fallo en Sednfile: [{0}] {1}
+endpoint.sendfile.addfail=Fallo en Sednfile: [{0}] [{1}]
 endpoint.sendfile.error=Error inesperado de envío de fichero
 endpoint.sendfile.nosupport=Desactivando sendfile ya que o la versión APR o el sistema no lo soportan
-endpoint.warn.noInsecureReneg=La renegociación segura no está soportada por la biblioteca SSL {0}
+endpoint.warn.noInsecureReneg=La renegociación segura no está soportada por la biblioteca SSL [{0}]
 endpoint.warn.nullSocket=Conector nulo devuelto por aceptación
 endpoint.warn.reinit=Reinicializando ServerSocket
 endpoint.warn.restart=Rearrancando punto final (endpoint)
-endpoint.warn.security=Punto Final (Endpoint) {0} con excepción de seguridad: {1}
+endpoint.warn.security=Punto Final (Endpoint) [{0}] con excepción de seguridad: [{1}]
 endpoint.warn.unlockAcceptorFailed=El hilo aceptador [{0}] falló al desbloquear. Forzando apagado de enchufe (socket).
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
index 1a9cd41..0695738 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-endpoint.err.fatal=Le point de contact {0} a été éteint suite à l''exception{1}
-endpoint.err.nonfatal=Le point de contact {0} a ignoré l''exception: {1}
+endpoint.err.fatal=Le point de contact [{0}] a été éteint suite à l''exception[{1}]
+endpoint.err.nonfatal=Le point de contact [{0}] a ignoré l''exception: [{1}]
 endpoint.warn.reinit=Réinitialisation du ServerSocket
 endpoint.warn.restart=Redémarrage du point de contact
diff --git a/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
index 792f003..5f0ee3b 100644
--- a/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-endpoint.err.fatal=例外のためにエンドポイント {0} はシャットダウンします: {1}
-endpoint.err.nonfatal=エンドポイント {0} は例外を無視しました: {1}
+endpoint.err.fatal=例外のためにエンドポイント [{0}] はシャットダウンします: [{1}]
+endpoint.err.nonfatal=エンドポイント [{0}] は例外を無視しました: [{1}]
 endpoint.warn.reinit=ServerSocketを再初期化します
 endpoint.warn.restart=エンドポイントを再起動します
-endpoint.warn.security=エンドポイント {0} のセキュリティ例外です: {1}
+endpoint.warn.security=エンドポイント [{0}] のセキュリティ例外です: [{1}]


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