svn commit: r1789480 [3/4] - in /tomcat/trunk/java/org/apache/catalina: connector/ core/ filters/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ mbeans/ realm/ servlets/ session/ startup/ storeconfig/ tribes/group/ tribes/group/intercept...

[ma...@apache.org]

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties Thu Mar 30 09:36:16 2017
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI registry for the {0} server using port {1}
-jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could not be created or failed to start for the {0} server
-jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could not be stopped for the {0} server
-jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the {0} server, [{1}], was invalid
-jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the registry on port {0} and the server on port {1} for the {2} server
+jmxRemoteLifecycleListener.createRegistryFailed=Unable to create the RMI registry for the [{0}] server using port [{1}]
+jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could not be created or failed to start for the [{0}] server
+jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could not be stopped for the [{0}] server
+jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the [{0}] server, [{1}], was invalid
+jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the registry on port [{0}] and the server on port [{1}] for the [{2}] server
 jmxRemoteLifecycleListener.invalidRmiBindAddress=Invalid RMI bind address [{0}]
 
 mBeanFactory.managerContext=Manager components may only be added to Contexts.

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties Thu Mar 30 09:36:16 2017
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-jmxRemoteLifecycleListener.createRegistryFailed=Cr\u00e9ation du r\u00e9pertoire RMI impossible pour le serveur {0} utilisant le port {1}
-jmxRemoteLifecycleListener.createServerFailed=Le connecteur serveur JMX pour le serveur {0} n''a pas pu \u00eatre cr\u00e9\u00e9 n''a pas d\u00e9marr\u00e9
-jmxRemoteLifecycleListener.destroyServerFailed=Le connecteur serveur JMX pour le serveur {0} n''a pas pu \u00eatre stopp\u00e9
-jmxRemoteLifecycleListener.invalidURL=L''URL demand\u00e9e pour le serveur {0}, [{1}], est incorrect
-jmxRemoteLifecycleListener.start=L''\u00e9couteur distant JMX a configur\u00e9 le r\u00e9pertoire sur le port {0} et le serveur sur le port {1} pour le serveur {2}
+jmxRemoteLifecycleListener.createRegistryFailed=Cr\u00e9ation du r\u00e9pertoire RMI impossible pour le serveur [{0}] utilisant le port [{1}]
+jmxRemoteLifecycleListener.createServerFailed=Le connecteur serveur JMX pour le serveur [{0}] n''a pas pu \u00eatre cr\u00e9\u00e9 n''a pas d\u00e9marr\u00e9
+jmxRemoteLifecycleListener.destroyServerFailed=Le connecteur serveur JMX pour le serveur [{0}] n''a pas pu \u00eatre stopp\u00e9
+jmxRemoteLifecycleListener.invalidURL=L''URL demand\u00e9e pour le serveur [{0}], [{1}], est incorrect
+jmxRemoteLifecycleListener.start=L''\u00e9couteur distant JMX a configur\u00e9 le r\u00e9pertoire sur le port [{0}] et le serveur sur le port [{1}] pour le serveur [{2}]

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Thu Mar 30 09:36:16 2017
@@ -32,52 +32,52 @@ jaasRealm.userPrincipalFailure=No valid
 jaasRealm.rolePrincipalAdd=Adding role Principal [{0}] to this user Principal''s roles
 jaasRealm.rolePrincipalFailure=No valid role Principals found.
 jaasCallback.username=Returned username [{0}]
-jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated
-jdbcRealm.authenticateSuccess=Username {0} successfully authenticated
+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.open=Exception opening database connection
 jdbcRealm.open.invalidurl=Driver [{0}] does not support the url [{1}]
-jndiRealm.authenticateFailure=Username {0} NOT successfully authenticated
-jndiRealm.authenticateSuccess=Username {0} successfully authenticated
+jndiRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
+jndiRealm.authenticateSuccess=Username [{0}] successfully authenticated
 jndiRealm.emptyCipherSuites=Empty String for cipher suites given. Using default cipher suites.
 jndiRealm.cipherSuites=Enable [{0}] as cipher suites for tls connection.
 jndiRealm.close=Exception closing directory server connection
 jndiRealm.exception=Exception performing authentication
 jndiRealm.exception.retry=Exception performing authentication. Retrying...
 jndiRealm.invalidHostnameVerifier=[{0}] not a valid class name for a HostnameVerifier
-jndiRealm.invalidSslProtocol=Given protocol [{0}] is invalid. It has to be one of {1}
+jndiRealm.invalidSslProtocol=Given protocol [{0}] is invalid. It has to be one of [{1}]
 jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for a SSLSocketFactory
 jndiRealm.negotiatedTls=Negotiated tls connection using protocol [{0}]
 jndiRealm.open=Exception opening directory server connection
 jndiRealm.tlsClose=Exception closing tls response
-memoryRealm.authenticateFailure=Username {0} NOT successfully authenticated
-memoryRealm.authenticateSuccess=Username {0} successfully authenticated
-memoryRealm.loadExist=Memory database file {0} cannot be read
-memoryRealm.loadPath=Loading users from memory database file {0}
+memoryRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
+memoryRealm.authenticateSuccess=Username [{0}] successfully authenticated
+memoryRealm.loadExist=Memory database file [{0}] cannot be read
+memoryRealm.loadPath=Loading users from memory database file [{0}]
 memoryRealm.readXml=Exception while reading memory database file
 memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java encoding names in XML files. Only IANA encoding names will be supported.
-realmBase.algorithm=Invalid message digest algorithm {0} specified
+realmBase.algorithm=Invalid message digest algorithm [{0}] specified
 realmBase.delegatedCredentialFail=Unable to obtain delegated credentials for user [{0}]
 realmBase.digest=Error digesting user credentials
 realmBase.forbidden=Access to the requested resource has been denied
-realmBase.hasRoleFailure=Username {0} does NOT have role {1}
-realmBase.hasRoleSuccess=Username {0} has role {1}
-realmBase.authenticateFailure=Username {0} NOT successfully authenticated
-realmBase.authenticateSuccess=Username {0} successfully authenticated
+realmBase.hasRoleFailure=Username [{0}] does NOT have role [{1}]
+realmBase.hasRoleSuccess=Username [{0}] has role [{1}]
+realmBase.authenticateFailure=Username [{0}] NOT successfully authenticated
+realmBase.authenticateSuccess=Username [{0}] successfully authenticated
 realmBase.gssNameFail=Failed to extract name from established GSSContext
-realmBase.gotX509Username=Got user name from X509 certificate: {0}
-realmBase.createUsernameRetriever.ClassCastException=Class {0} is not an X509UsernameRetriever.
-realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class {0}.
-realmBase.createUsernameRetriever.InstantiationException=Cannot create object of type {0}.
-realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object of type {0}.
+realmBase.gotX509Username=Got user name from X509 certificate: [{0}]
+realmBase.createUsernameRetriever.ClassCastException=Class [{0}] is not an X509UsernameRetriever.
+realmBase.createUsernameRetriever.ClassNotFoundException=Cannot find class [{0}].
+realmBase.createUsernameRetriever.InstantiationException=Cannot create object of type [{0}].
+realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object of type [{0}].
 realmBase.credentialHandler.customCredentialHandler=Unable to set the property [{0}] to value [{1}] as a custom CredentialHandler has been configured
 realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
 realmBase.gssContextNotEstablished=Authenticator implementation error: the passed security context is not fully established
-userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
-userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}
-dataSourceRealm.authenticateFailure=Username {0} NOT successfully authenticated
-dataSourceRealm.authenticateSuccess=Username {0} successfully authenticated
+userDatabaseRealm.lookup=Exception looking up UserDatabase under key [{0}]
+userDatabaseRealm.noDatabase=No UserDatabase component found under key [{0}]
+dataSourceRealm.authenticateFailure=Username [{0}] NOT successfully authenticated
+dataSourceRealm.authenticateSuccess=Username [{0}] successfully authenticated
 dataSourceRealm.close=Exception closing database connection
 dataSourceRealm.exception=Exception performing authentication
 dataSourceRealm.getPassword.exception=Exception retrieving password for [{0}]
@@ -91,7 +91,7 @@ combinedRealm.authSuccess=Authenticated
 combinedRealm.addRealm=Add [{0}] realm, making a total of [{1}] realms
 combinedRealm.realmStartFail=Failed to start [{0}] realm
 lockOutRealm.authLockedUser=An attempt was made to authenticate the locked user [{0}]
-lockOutRealm.removeWarning=User [{0}] was removed from the failed users cache after {1} seconds to keep the cache size within the limit set
+lockOutRealm.removeWarning=User [{0}] was removed from the failed users cache after [{1}] seconds to keep the cache size within the limit set
 credentialHandler.invalidStoredCredential=The invalid stored credential string [{0}] was provided by the Realm to match with the user provided credentials
 credentialHandler.unableToMutateUserCredential=Failed to mutate user provided credentials. This typically means the CredentialHandler configuration is invalid
 mdCredentialHandler.unknownEncoding=The encoding [{0}] is not supported so the current setting of [{1}] will still be used

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties Thu Mar 30 09:36:16 2017
@@ -16,12 +16,12 @@ jaasRealm.beginLogin = JAASRealm login r
 #
 # language es
 # package org.apache.catalina.realm
-jaasRealm.accountExpired = El usuario {0} NO ha sido autentificado porque ha expirado su cuenta
+jaasRealm.accountExpired = El usuario [{0}] NO ha sido autentificado porque ha expirado su cuenta
 jaasRealm.authenticateFailure = Nombre de usuario [{0}] NO autenticado con \u00E9xito
 jaasRealm.authenticateSuccess = Nombre de usuario [{0}] autenticado con \u00E9xito como Principal [{1}] -- Tambi\u00E9n se ha creado el Asunto
-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.loginException = Excepci\u00F3n de Login autenticando nombre de usuario {0}
+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.loginException = Excepci\u00F3n de Login autenticando nombre de usuario [{0}]
 jaasRealm.unexpectedError = Error inesperado
 jaasRealm.loginContextCreated = JAAS LoginContext creado para nombre de usuario [{0}]
 jaasRealm.checkPrincipal = Revisando Principal [{0}] [{1}]
@@ -30,36 +30,36 @@ jaasRealm.userPrincipalFailure = No se h
 jaasRealm.rolePrincipalAdd = A\u00F1adiend papel Principal [{0}] a los papeles de este usuario Principal
 jaasRealm.rolePrincipalFailure = No se han hallado papeles de Principal v\u00E1lidos.
 jaasCallback.username = Devuelto nombre de usuario [{0}]
-jdbcRealm.authenticateFailure = El usuario {0} NO ha sido autentificado correctamente
-jdbcRealm.authenticateSuccess = El usuario {0} ha sido autentificado correctamente
+jdbcRealm.authenticateFailure = El usuario [{0}] NO ha sido autentificado correctamente
+jdbcRealm.authenticateSuccess = El usuario [{0}] ha sido autentificado correctamente
 jdbcRealm.close = Excepci\u00F3n al cerrar la conexi\u00F3n a la base de datos
 jdbcRealm.exception = Excepci\u00F3n al realizar la autentificaci\u00F3n
 jdbcRealm.open = Excepci\u00F3n abriendo la conexi\u00F3n a la base de datos
 jdbcRealm.open.invalidurl = El conductor [{0}] no soporta la url [{1}]
-jndiRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario {0}
-jndiRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario {0}
+jndiRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario [{0}]
+jndiRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario [{0}]
 jndiRealm.close = Excepci\u00F3n al cerrar la conexi\u00F3n al servidor de directorio
 jndiRealm.exception = Excepci\u00F3n al realizar la autentificaci\u00F3n
 jndiRealm.open = Excepci\u00F3n al abrir la conexi\u00F3n al servidor de directorio
-memoryRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario {0}
-memoryRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario {0}
-memoryRealm.loadExist = El fichero de usuarios {0} no ha podido ser le\u00EDdo
-memoryRealm.loadPath = Cargando los usuarios desde el fichero {0}
+memoryRealm.authenticateFailure = Autentificaci\u00F3n fallida para el usuario [{0}]
+memoryRealm.authenticateSuccess = Autentificaci\u00F3n correcta para el usuario [{0}]
+memoryRealm.loadExist = El fichero de usuarios [{0}] no ha podido ser le\u00EDdo
+memoryRealm.loadPath = Cargando los usuarios desde el fichero [{0}]
 memoryRealm.readXml = Excepci\u00F3n mientras se le\u00EDa el fichero de usuarios
 memoryRealm.xmlFeatureEncoding = Excepci\u00F3n al configurar resumidor para permitir nombres con codificaci\u00F3n java en ficheros XML. S\u00F3llo se soportan nombres con codificaci\u00F3n IANA.
-realmBase.algorithm = El algoritmo resumen (digest) {0} es inv\u00E1lido
+realmBase.algorithm = El algoritmo resumen (digest) [{0}] es inv\u00E1lido
 realmBase.delegatedCredentialFail = No pude obtener credenciales de delegado para el usuario [{0}]
 realmBase.digest = Error procesando las credenciales del usuario
 realmBase.forbidden = El acceso al recurso pedido ha sido denegado
-realmBase.hasRoleFailure = El usuario {0} NO desempe\u00F1a el papel de {1}
-realmBase.hasRoleSuccess = El usuario {0} desempe\u00F1a el papel de {1}
-realmBase.authenticateFailure = Nombre de usuario {0} NO autenticado con \u00E9xito
-realmBase.authenticateSuccess = Nombre de usuario {0} autenticado con \u00E9xito
+realmBase.hasRoleFailure = El usuario [{0}] NO desempe\u00F1a el papel de [{1}]
+realmBase.hasRoleSuccess = El usuario [{0}] desempe\u00F1a el papel de [{1}]
+realmBase.authenticateFailure = Nombre de usuario [{0}] NO autenticado con \u00E9xito
+realmBase.authenticateSuccess = Nombre de usuario [{0}] autenticado con \u00E9xito
 realmBase.gssNameFail = No pude extraer el nombre desde el GSSContext establecido
-userDatabaseRealm.lookup = Excepci\u00F3n 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}
-dataSourceRealm.authenticateFailure = Nombre de usuario {0} NO autenticado con \u00E9xito
-dataSourceRealm.authenticateSuccess = Nombre de usuario {0} autenticado con \u00E9xito
+userDatabaseRealm.lookup = Excepci\u00F3n 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}]
+dataSourceRealm.authenticateFailure = Nombre de usuario [{0}] NO autenticado con \u00E9xito
+dataSourceRealm.authenticateSuccess = Nombre de usuario [{0}] autenticado con \u00E9xito
 dataSourceRealm.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos
 dataSourceRealm.exception = Excepci\u00F3n realizando autenticaci\u00F3n
 dataSourceRealm.getPassword.exception = Excepci\u00F3n recuperando contrase\u00F1a para [{0}]
@@ -73,4 +73,4 @@ combinedRealm.authSuccess = Usuario aute
 combinedRealm.addRealm = A\u00F1adir reino [{0}], totalizando [{1}] reinos
 combinedRealm.realmStartFail = No pude arrancar reino [{0}]
 lockOutRealm.authLockedUser = Se ha intentado autentica al usuario bloqueado [{0}]
-lockOutRealm.removeWarning = Se ha quitado al usuario [{0}] de la cach\u00E9 de usuarios fallidos tras {1} secgundos para mantener la medida de cach\u00E9 dentro de los l\u00EDmites
+lockOutRealm.removeWarning = Se ha quitado al usuario [{0}] de la cach\u00E9 de usuarios fallidos tras [{1}] secgundos para mantener la medida de cach\u00E9 dentro de los l\u00EDmites

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties Thu Mar 30 09:36:16 2017
@@ -17,33 +17,33 @@
 
 # package org.apache.catalina.realm
 
-jaasRealm.accountExpired=le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9 car le compte a expir\u00e9
-jaasRealm.authenticateSuccess=le nom d''utilisateur {0} a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
-jaasRealm.credentialExpired=le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9 car son cr\u00e9dit a expir\u00e9 (expired credential)
-jaasRealm.failedLogin=le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9 car son contr\u00f4le d''acc\u00e8s (login) a \u00e9chou\u00e9
-jaasRealm.loginException=Exception lors de l''authentification par login du nom d''utilisateur {0}
-jdbcRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9
-jdbcRealm.authenticateSuccess=le nom d''utilisateur {0} a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
+jaasRealm.accountExpired=le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9 car le compte a expir\u00e9
+jaasRealm.authenticateSuccess=le nom d''utilisateur [{0}] a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
+jaasRealm.credentialExpired=le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9 car son cr\u00e9dit a expir\u00e9 (expired credential)
+jaasRealm.failedLogin=le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9 car son contr\u00f4le d''acc\u00e8s (login) a \u00e9chou\u00e9
+jaasRealm.loginException=Exception lors de l''authentification par login du nom d''utilisateur [{0}]
+jdbcRealm.authenticateFailure=le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9
+jdbcRealm.authenticateSuccess=le nom d''utilisateur [{0}] a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
 jdbcRealm.close=Exception lors de la fermeture de la connexion \u00e0 la base de donn\u00e9es
 jdbcRealm.exception=Exception pendant le traitement de l''authentification
 jdbcRealm.open=Exception lors de l''ouverture de la base de donn\u00e9es
-jndiRealm.authenticateFailure=Le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9
-jndiRealm.authenticateSuccess=Le nom d''utilisateur {0} a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
+jndiRealm.authenticateFailure=Le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9
+jndiRealm.authenticateSuccess=Le nom d''utilisateur [{0}] a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
 jndiRealm.close=Exception lors de la fermeture de la connexion au serveur d''acc\u00e8s (directory server)
 jndiRealm.exception=Exception pendant le traitement de l''authentification
 jndiRealm.open=Exception lors de l''ouverture de la connexion au serveur d''acc\u00e8s (directory server)
-memoryRealm.authenticateFailure=le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9
-memoryRealm.authenticateSuccess=le nom d''utilisateur {0} a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
-memoryRealm.loadExist=Le fichier base de donn\u00e9es m\u00e9moire (memory database) {0} ne peut \u00eatre lu
-memoryRealm.loadPath=Chargement des utilisateurs depuis le fichier base de donn\u00e9es m\u00e9moire (memory database) {0}
+memoryRealm.authenticateFailure=le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9
+memoryRealm.authenticateSuccess=le nom d''utilisateur [{0}] a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
+memoryRealm.loadExist=Le fichier base de donn\u00e9es m\u00e9moire (memory database) [{0}] ne peut \u00eatre lu
+memoryRealm.loadPath=Chargement des utilisateurs depuis le fichier base de donn\u00e9es m\u00e9moire (memory database) [{0}]
 memoryRealm.readXml=Exception lors de la lecture du fichier base de donn\u00e9es m\u00e9moire (memory database)
-realmBase.algorithm=L''algorithme d''empreinte de message (message digest) {0} indiqu\u00e9 est invalide
+realmBase.algorithm=L''algorithme d''empreinte de message (message digest) [{0}] indiqu\u00e9 est invalide
 realmBase.digest=Erreur lors du traitement des empreintes (digest) des cr\u00e9dits utilisateur (user credentials)
 realmBase.forbidden=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit
-realmBase.hasRoleFailure=Le nom d''utilisateur {0} N''A PAS de r\u00f4le {1}
-realmBase.hasRoleSuccess=Le nom d''utilisateur {0} a pour r\u00f4le {1}
-realmBase.authenticateFailure=Le nom d''utilisateur {0} N''A PAS \u00e9t\u00e9 authentifi\u00e9
-realmBase.authenticateSuccess=Le nom d''utilisateur {0} a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
-userDatabaseRealm.lookup=Exception lors de la recherche dans la base de donn\u00e9es utilisateurs avec la cl\u00e9 {0}
-userDatabaseRealm.noDatabase=Aucun composant base de donn\u00e9es utilisateurs trouv\u00e9 pour la cl\u00e9 {0}
+realmBase.hasRoleFailure=Le nom d''utilisateur [{0}] N''A PAS de r\u00f4le [{1}]
+realmBase.hasRoleSuccess=Le nom d''utilisateur [{0}] a pour r\u00f4le [{1}]
+realmBase.authenticateFailure=Le nom d''utilisateur [{0}] N''A PAS \u00e9t\u00e9 authentifi\u00e9
+realmBase.authenticateSuccess=Le nom d''utilisateur [{0}] a \u00e9t\u00e9 authentifi\u00e9 avec succ\u00e8s
+userDatabaseRealm.lookup=Exception lors de la recherche dans la base de donn\u00e9es utilisateurs avec la cl\u00e9 [{0}]
+userDatabaseRealm.noDatabase=Aucun composant base de donn\u00e9es utilisateurs trouv\u00e9 pour la cl\u00e9 [{0}]
 

Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties Thu Mar 30 09:36:16 2017
@@ -17,38 +17,38 @@
 
 # package org.apache.catalina.realm
 
-jaasRealm.accountExpired=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
-jaasRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-jaasRealm.credentialExpired=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a3c\u660e\u66f8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
-jaasRealm.failedLogin=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
-jaasRealm.loginException=\u30e6\u30fc\u30b6\u540d {0} \u306e\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+jaasRealm.accountExpired=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
+jaasRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+jaasRealm.credentialExpired=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a3c\u660e\u66f8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093
+jaasRealm.failedLogin=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u30ed\u30b0\u30a4\u30f3\u306b\u5931\u6557\u3057\u305f\u305f\u3081\u306b\u8a8d\u8a3c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f
+jaasRealm.loginException=\u30e6\u30fc\u30b6\u540d [{0}] \u306e\u8a8d\u8a3c\u4e2d\u306b\u30ed\u30b0\u30a4\u30f3\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 jaasRealm.unexpectedError=\u4e88\u6e2c\u3057\u306a\u3044\u30a8\u30e9\u30fc\u3067\u3059
-jdbcRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-jdbcRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+jdbcRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+jdbcRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
 jdbcRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 jdbcRealm.exception=\u8a8d\u8a3c\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 jdbcRealm.open=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30aa\u30fc\u30d7\u30f3\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-jndiRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-jndiRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+jndiRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+jndiRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
 jndiRealm.close=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u63a5\u7d9a\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 jndiRealm.exception=\u8a8d\u8a3c\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 jndiRealm.open=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u63a5\u7d9a\u30aa\u30fc\u30d7\u30f3\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-memoryRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-memoryRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-memoryRealm.loadExist=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb {0} \u3092\u8aad\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-memoryRealm.loadPath=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb {0} \u304b\u3089\u30e6\u30fc\u30b6\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
+memoryRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+memoryRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+memoryRealm.loadExist=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb [{0}] \u3092\u8aad\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
+memoryRealm.loadPath=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb [{0}] \u304b\u3089\u30e6\u30fc\u30b6\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
 memoryRealm.readXml=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u307f\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-realmBase.algorithm=\u7121\u52b9\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 {0} \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
+realmBase.algorithm=\u7121\u52b9\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 [{0}] \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
 realmBase.digest=\u30e6\u30fc\u30b6\u306e\u8a3c\u660e\u66f8\u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a8\u30e9\u30fc
 realmBase.forbidden=\u8981\u6c42\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
-realmBase.hasRoleFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1} \u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
-realmBase.hasRoleSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1} \u3092\u6301\u3063\u3066\u3044\u307e\u3059
-realmBase.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-realmBase.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
-userDatabaseRealm.lookup=\u30ad\u30fc {0} \u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u691c\u7d22\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-userDatabaseRealm.noDatabase=\u30ad\u30fc {0} \u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-dataSourceRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-dataSourceRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+realmBase.hasRoleFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u30ed\u30fc\u30eb [{1}] \u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
+realmBase.hasRoleSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u30ed\u30fc\u30eb [{1}] \u3092\u6301\u3063\u3066\u3044\u307e\u3059
+realmBase.authenticateFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+realmBase.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
+userDatabaseRealm.lookup=\u30ad\u30fc [{0}] \u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u691c\u7d22\u4e2d\u306e\u4f8b\u5916\u3067\u3059
+userDatabaseRealm.noDatabase=\u30ad\u30fc [{0}] \u3067\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
+dataSourceRealm.authenticateFailure=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u5931\u6557\u3057\u307e\u3057\u305f
+dataSourceRealm.authenticateSuccess=\u30e6\u30fc\u30b6\u540d [{0}] \u306f\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f
 dataSourceRealm.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 dataSourceRealm.exception=\u8a8d\u8a3c\u3092\u5b9f\u884c\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties Thu Mar 30 09:36:16 2017
@@ -37,10 +37,10 @@ defaultServlet.blockExternalSubset=Block
 defaultServlet.missingResource=The requested resource [{0}] is not available
 defaultservlet.skipfail=Only skipped [{0}] bytes when [{1}] were requested
 webdavservlet.jaxpfailed=JAXP initialization failed
-webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID {0} and SystemID {1} which was ignored
+webdavservlet.enternalEntityIgnored=The request included a reference to an external entity with PublicID [{0}] and SystemID [{1}] which was ignored
 webdavservlet.inputstreamclosefail=Failed to close the inputStream of [{0}]
 directory.filename=Filename
 directory.lastModified=Last Modified
-directory.parent=Up To {0}
+directory.parent=Up To [{0}]
 directory.size=Size
-directory.title=Directory Listing For {0}
+directory.title=Directory Listing For [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties Thu Mar 30 09:36:16 2017
@@ -1,4 +1,4 @@
-defaultServlet.missingResource = El recurso requerido {0} no se encuentra disponible
+defaultServlet.missingResource = El recurso requerido [{0}] no se encuentra disponible
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,9 +15,9 @@ defaultServlet.missingResource = El recu
 # limitations under the License.
 defaultservlet.skipfail = S\u00F3lo se han saltado [{0}] cuando se requirieron [{1}]
 webdavservlet.jaxpfailed = Fall\u00F3 la inicializaci\u00F3n de JAXP
-webdavservlet.enternalEntityIgnored = El requerimiento inclu\u00EDa una referencia a una entidad externa con PublicID {0} y SystemID {1} que fue ignorada
+webdavservlet.enternalEntityIgnored = El requerimiento inclu\u00EDa una referencia a una entidad externa con PublicID [{0}] y SystemID [{1}] que fue ignorada
 directory.filename = Nombre de Fichero:
 directory.lastModified = \u00DAltima Modificaci\u00F3n
-directory.parent = Atr\u00E1s A {0}
+directory.parent = Atr\u00E1s A [{0}]
 directory.size = Medida
-directory.title = Listado de Directorio Para {0}
+directory.title = Listado de Directorio Para [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties Thu Mar 30 09:36:16 2017
@@ -16,7 +16,7 @@
 webdavservlet.jaxpfailed=Erreur d''initialisation de JAXP
 directory.filename=Nom de fichier
 directory.lastModified=Derni\u00e8re modification
-directory.parent=Jusqu''\u00e0 {0}
+directory.parent=Jusqu''\u00e0 [{0}]
 directory.size=Taille
-directory.title=Liste du r\u00e9pertoire pour {0}
+directory.title=Liste du r\u00e9pertoire pour [{0}]
 

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties Thu Mar 30 09:36:16 2017
@@ -16,6 +16,6 @@
 webdavservlet.jaxpfailed=JAXP\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 directory.filename=\u30d5\u30a1\u30a4\u30eb\u540d
 directory.lastModified=\u6700\u7d42\u66f4\u65b0
-directory.parent={0} \u306b\u79fb\u52d5
+directory.parent=[{0}] \u306b\u79fb\u52d5
 directory.size=\u30b5\u30a4\u30ba
-directory.title={0} \u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e00\u89a7
+directory.title=[{0}] \u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u4e00\u89a7

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Thu Mar 30 09:36:16 2017
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileStore.saving=Saving Session {0} to file {1}
-fileStore.loading=Loading Session {0} from file {1}
-fileStore.removing=Removing Session {0} at file {1}
+fileStore.saving=Saving Session [{0}] to file [{1}]
+fileStore.loading=Loading Session [{0}] from file [{1}]
+fileStore.removing=Removing Session [{0}] at file [{1}]
 fileStore.deleteFailed=Unable to delete file [{0}] which is preventing the creation of the session storage location
 fileStore.createFailed=Unable to create directory [{0}] for the storage of session data
-JDBCStore.close=Exception closing database connection {0}
-JDBCStore.saving=Saving Session {0} to database {1}
-JDBCStore.loading=Loading Session {0} from database {1}
-JDBCStore.removing=Removing Session {0} at database {1}
-JDBCStore.SQLException=SQL Error {0}
+JDBCStore.close=Exception closing database connection [{0}]
+JDBCStore.saving=Saving Session [{0}] to database [{1}]
+JDBCStore.loading=Loading Session [{0}] from database [{1}]
+JDBCStore.removing=Removing Session [{0}] at database [{1}]
+JDBCStore.SQLException=SQL Error [{0}]
 JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be closed. Trying to re-open it.
 JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database could be down.
-JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
-JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
+JDBCStore.checkConnectionSQLException=A SQL exception occurred [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found [{0}]
 JDBCStore.wrongDataSource=Cannot open JNDI DataSource [{0}]
 JDBCStore.missingDataSourceName=No valid JNDI name was given.
 JDBCStore.commitSQLException=SQLException committing connection before closing
@@ -35,11 +35,11 @@ managerBase.contextNull=The Context must
 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}]
-managerBase.sessionTimeout=Invalid session timeout setting {0}
+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
-standardManager.loading=Loading persisted sessions from {0}
+standardManager.loading=Loading persisted sessions from [{0}]
 standardManager.loading.exception=Exception while loading persisted sessions
-standardManager.unloading=Saving persisted sessions to {0}
+standardManager.unloading=Saving persisted sessions to [{0}]
 standardManager.unloading.debug=Unloading persisted sessions
 standardManager.unloading.nosessions=No persisted sessions to unload
 standardManager.managerLoad=Exception loading sessions from persistent storage
@@ -56,23 +56,23 @@ standardSession.getThisAccessedTime.ise=
 standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already invalidated
 standardSession.getValueNames.ise=getValueNames: Session already invalidated
 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.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.sessionEvent=Session event listener threw exception
-standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0}
+standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
 standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
-persistentManager.loading=Loading {0} persisted sessions
-persistentManager.unloading=Saving {0} persisted sessions
-persistentManager.deserializeError=Error deserializing Session {0}: {1}
-persistentManager.serializeError=Error serializing Session {0}: {1}
-persistentManager.swapMaxIdle=Swapping session {0} to Store, idle for {1} seconds
-persistentManager.backupMaxIdle=Backing up session {0} to Store, idle for {1} seconds
-persistentManager.tooManyActive=Too many active sessions, {0}, looking for idle sessions to swap out
-persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} seconds too many sessions active
-persistentManager.swapIn=Swapping session {0} in from Store
-persistentManager.swapInException=Exception in the Store during swapIn: {0}
-persistentManager.swapInInvalid=Swapped session {0} is invalid
+persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.unloading=Saving [{0}] persisted sessions
+persistentManager.deserializeError=Error deserializing Session [{0}]: [{1}]
+persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
+persistentManager.swapMaxIdle=Swapping session [{0}] to Store, idle for [{1}] seconds
+persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for [{1}] seconds
+persistentManager.tooManyActive=Too many active sessions, [{0}], looking for idle sessions to swap out
+persistentManager.swapTooManyActive=Swapping out session [{0}], idle for [{1}] seconds too many sessions active
+persistentManager.swapIn=Swapping session [{0}] in from Store
+persistentManager.swapInException=Exception in the Store during swapIn: [{0}]
+persistentManager.swapInInvalid=Swapped session [{0}] is invalid
 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

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_es.properties Thu Mar 30 09:36:16 2017
@@ -12,23 +12,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-fileStore.saving = Salvando Sesi\u00F3n {0} en archivo {1}
-fileStore.loading = Cargando Sesi\u00F3n {0} desde archivo {1}
-fileStore.removing = Quitando Sesi\u00F3n {0} en archivo {1}
-JDBCStore.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos {0}
-JDBCStore.saving = Salvando Sesi\u00F3n {0} en base de datos {1}
-JDBCStore.loading = Cargando Sesi\u00F3n {0} desde base de datos {1}
-JDBCStore.removing = Quitando Sesi\u00F3n {0} en base de datos {1}
-JDBCStore.SQLException = Error SQL {0}
+fileStore.saving = Salvando Sesi\u00F3n [{0}] en archivo [{1}]
+fileStore.loading = Cargando Sesi\u00F3n [{0}] desde archivo [{1}]
+fileStore.removing = Quitando Sesi\u00F3n [{0}] en archivo [{1}]
+JDBCStore.close = Excepci\u00F3n cerrando conexi\u00F3n a base de datos [{0}]
+JDBCStore.saving = Salvando Sesi\u00F3n [{0}] en base de datos [{1}]
+JDBCStore.loading = Cargando Sesi\u00F3n [{0}] desde base de datos [{1}]
+JDBCStore.removing = Quitando Sesi\u00F3n [{0}] en base de datos [{1}]
+JDBCStore.SQLException = Error SQL [{0}]
 JDBCStore.checkConnectionDBClosed = La conexi\u00F3na a base de datos es nula o est\u00E1 cerrada. Intentando reabrirla.
 JDBCStore.checkConnectionDBReOpenFail = Fall\u00F3 la reapertura de la base de datos. Puede que la base de datos est\u00E9 ca\u00EDda.
-JDBCStore.checkConnectionSQLException = Ha tenido lugar una excepci\u00F3n SQL {0}
-JDBCStore.checkConnectionClassNotFoundException = No se ha hallado la clase del manejador (driver) JDBC {0}
+JDBCStore.checkConnectionSQLException = Ha tenido lugar una excepci\u00F3n SQL [{0}]
+JDBCStore.checkConnectionClassNotFoundException = No se ha hallado la clase del manejador (driver) JDBC [{0}]
 managerBase.createSession.ise = createSession: Demasiadas sesiones activas
-managerBase.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de sesi\u00F3n {0}
-standardManager.loading = Cargando sesiones persistidas desde {0}
+managerBase.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de sesi\u00F3n [{0}]
+standardManager.loading = Cargando sesiones persistidas desde [{0}]
 standardManager.loading.exception = Exception al cargar sesiones persistidas
-standardManager.unloading = Salvando sesiones persistidas a {0}
+standardManager.unloading = Salvando sesiones persistidas a [{0}]
 standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde almacenamiento persistente
 standardManager.managerUnload = Excepci\u00F3n descargando sesiones a almacenamiento persistente
 standardSession.attributeEvent = El oyente de eventos de atributo de Sesi\u00F3n lanz\u00F3 una excepci\u00F3n
@@ -41,18 +41,18 @@ standardSession.getCreationTime.ise = ge
 standardSession.getThisAccessedTime.ise = getThisAccessedTime: La Sesi\u00F3n ya ha sido invalidada
 standardSession.getLastAccessedTime.ise = getLastAccessedTime: La Sesi\u00F3n ya ha sido invalidada
 standardSession.getValueNames.ise = getValueNames: La Sesi\u00F3n ya ha sido invalidada
-standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n {0} para sesi\u00F3n {1}
+standardSession.notSerializable = No puedo serializar atributo de sesi\u00F3n [{0}] para sesi\u00F3n [{1}]
 standardSession.removeAttribute.ise = removeAttribute: La Sesi\u00F3n ya ha sido invalidada
 standardSession.sessionEvent = El oyente de evento de Sesi\u00F3n lanz\u00F3 una execpci\u00F3n
-standardSession.setAttribute.iae = setAttribute: Atributo {0} no serializable
+standardSession.setAttribute.iae = setAttribute: Atributo [{0}] no serializable
 standardSession.setAttribute.ise = setAttribute: La Sesi\u00F3n ya ha sido invalidada
 standardSession.setAttribute.namenull = setAttribute: el nuevo par\u00E1metro no puede ser nulo
-persistentManager.loading = Cargando {0} sesiones persistidas
-persistentManager.unloading = Salvando {0} sesiones persistidas
-persistentManager.deserializeError = Error des-serializando Sesi\u00F3n {0}: {1}
-persistentManager.serializeError = Error serializando Sesi\u00F3n {0}: {1}
-persistentManager.swapMaxIdle = Intercambiando sesi\u00F3n {0} a fuera a Almac\u00E9n, ociosa durante {1} segundos
-persistentManager.backupMaxIdle = Respaldando sesi\u00F3n {0} a Almac\u00E9n, ociosa durante {1} segundos
-persistentManager.tooManyActive = Demasiadas sesiones activas, {0}, buscando sesiones ociosas para intercambiar
-persistentManager.swapTooManyActive = Intercambiando sesi\u00F3n {0} a fuera, ociosa durante {1} segundos: Demasiadas sesiones activas
-persistentManager.swapIn = Intercambiando sesi\u00F3n {0} a dentro desde Almac\u00E9n
+persistentManager.loading = Cargando [{0}] sesiones persistidas
+persistentManager.unloading = Salvando [{0}] sesiones persistidas
+persistentManager.deserializeError = Error des-serializando Sesi\u00F3n [{0}]: [{1}]
+persistentManager.serializeError = Error serializando Sesi\u00F3n [{0}]: [{1}]
+persistentManager.swapMaxIdle = Intercambiando sesi\u00F3n [{0}] a fuera a Almac\u00E9n, ociosa durante [{1}] segundos
+persistentManager.backupMaxIdle = Respaldando sesi\u00F3n [{0}] a Almac\u00E9n, ociosa durante [{1}] segundos
+persistentManager.tooManyActive = Demasiadas sesiones activas, [{0}], buscando sesiones ociosas para intercambiar
+persistentManager.swapTooManyActive = Intercambiando sesi\u00F3n [{0}] a fuera, ociosa durante [{1}] segundos: Demasiadas sesiones activas
+persistentManager.swapIn = Intercambiando sesi\u00F3n [{0}] a dentro desde Almac\u00E9n

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties Thu Mar 30 09:36:16 2017
@@ -13,22 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileStore.saving=Sauvegarde de la Session {0} vers le fichier {1}
-fileStore.loading=Chargement de la Session {0} depuis le fichier {1}
-fileStore.removing=Retrait de la Session {0} du fichier {1}
-JDBCStore.saving=Sauvegarde de la Session {0} vers la base de donn\u00e9es {1}
-JDBCStore.loading=Chargement de la Session {0} depuis la base de donn\u00e9es {1}
-JDBCStore.removing=Retrait de la Session {0} de la base de donn\u00e9es {1}
-JDBCStore.SQLException=Erreur SQL {0}
+fileStore.saving=Sauvegarde de la Session [{0}] vers le fichier [{1}]
+fileStore.loading=Chargement de la Session [{0}] depuis le fichier [{1}]
+fileStore.removing=Retrait de la Session [{0}] du fichier [{1}]
+JDBCStore.saving=Sauvegarde de la Session [{0}] vers la base de donn\u00e9es [{1}]
+JDBCStore.loading=Chargement de la Session [{0}] depuis la base de donn\u00e9es [{1}]
+JDBCStore.removing=Retrait de la Session [{0}] de la base de donn\u00e9es [{1}]
+JDBCStore.SQLException=Erreur SQL [{0}]
 JDBCStore.checkConnectionDBClosed=La connexion \u00e0 la base de donn\u00e9es est nulle ou a \u00e9t\u00e9 trouv\u00e9e ferm\u00e9e. Tentative de r\u00e9ouverture.
 JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture de la base de donn\u00e9es a \u00e9chou\u00e9. La base de donn\u00e9es est peut-\u00eatre arr\u00eat\u00e9e.
-JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite {0}
-JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas \u00e9t\u00e9 trouv\u00e9e {0}
+JDBCStore.checkConnectionSQLException=Une exception SQL s''est produite [{0}]
+JDBCStore.checkConnectionClassNotFoundException=La classe du driver JDBC n''a pas \u00e9t\u00e9 trouv\u00e9e [{0}]
 managerBase.createSession.ise="createSession": Trop de sessions actives
-managerBase.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9 (timeout) de session invalide {0}
-standardManager.loading=Chargement des sessions qui ont persist\u00e9 depuis {0}
+managerBase.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9 (timeout) de session invalide [{0}]
+standardManager.loading=Chargement des sessions qui ont persist\u00e9 depuis [{0}]
 standardManager.loading.exception="Exception" lors du chargement de sessions persistantes
-standardManager.unloading=Sauvegarde des sessions ayant persist\u00e9 vers {0}
+standardManager.unloading=Sauvegarde des sessions ayant persist\u00e9 vers [{0}]
 standardManager.managerLoad=Exception au chargement des sessions depuis le stockage persistant (persistent storage)
 standardManager.managerUnload=Exception au d\u00e9chargement des sessions vers le stockage persistant (persistent storage)
 standardSession.attributeEvent=L''\u00e9couteur d''\u00e9v\u00e8nement Attribut de Session (attribute event listener) a g\u00e9n\u00e9r\u00e9 une exception
@@ -40,18 +40,18 @@ standardSession.getCreationTime.ise="get
 standardSession.getThisAccessedTime.ise="getThisAccessedTime": Session d\u00e9j\u00e0 invalid\u00e9e
 standardSession.getLastAccessedTime.ise="getLastAccessedTime": Session d\u00e9j\u00e0 invalid\u00e9e
 standardSession.getValueNames.ise="getValueNames": Session d\u00e9j\u00e0 invalid\u00e9e
-standardSession.notSerializable=Impossible de s\u00e9rialiser l''attribut de session {0} pour la session {1}
+standardSession.notSerializable=Impossible de s\u00e9rialiser l''attribut de session [{0}] pour la session [{1}]
 standardSession.removeAttribute.ise="removeAttribute": Session d\u00e9j\u00e0 invalid\u00e9e
 standardSession.sessionEvent=L''\u00e9couteur d''\u00e9v\u00e8nement de session (session event listener) a g\u00e9n\u00e9r\u00e9 une exception
-standardSession.setAttribute.iae="setAttribute": Attribut {0} non s\u00e9rialisable
+standardSession.setAttribute.iae="setAttribute": Attribut [{0}] non s\u00e9rialisable
 standardSession.setAttribute.ise="setAttribute": Session d\u00e9j\u00e0 invalid\u00e9e
 standardSession.setAttribute.namenull="setAttribute": le nom de param\u00e8tre ne peut \u00eatre nul
-persistentManager.loading=Chargement de {0} sessions persistantes
-persistentManager.unloading=Sauvegarde de {0} sessions persistantes
-persistentManager.deserializeError=Erreur lors de la d\u00e9s\u00e9rialisation de la session {0}: {1}
-persistentManager.serializeError=Erreur lors de la s\u00e9rialisation de la session {0}: {1}
-persistentManager.swapMaxIdle=Basculement de la session {0} vers le stockage (Store), en attente pour {1} secondes
-persistentManager.backupMaxIdle=Sauvegarde de la session {0} vers le stockage (Store), en attente pour {1} secondes
-persistentManager.tooManyActive=Trop de sessions actives, {0}, \u00e0 la recherche de sessions en attente pour basculement vers stockage (swap out)
-persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de la session {0}, en attente pour {1} secondes trop de sessions actives
-persistentManager.swapIn=Basculement depuis le stockage (swap in) de la session {0}
+persistentManager.loading=Chargement de [{0}] sessions persistantes
+persistentManager.unloading=Sauvegarde de [{0}] sessions persistantes
+persistentManager.deserializeError=Erreur lors de la d\u00e9s\u00e9rialisation de la session [{0}]: [{1}]
+persistentManager.serializeError=Erreur lors de la s\u00e9rialisation de la session [{0}]: [{1}]
+persistentManager.swapMaxIdle=Basculement de la session [{0}] vers le stockage (Store), en attente pour [{1}] secondes
+persistentManager.backupMaxIdle=Sauvegarde de la session [{0}] vers le stockage (Store), en attente pour [{1}] secondes
+persistentManager.tooManyActive=Trop de sessions actives, [{0}], \u00e0 la recherche de sessions en attente pour basculement vers stockage (swap out)
+persistentManager.swapTooManyActive=Basculement vers stockage (swap out) de la session [{0}], en attente pour [{1}] secondes trop de sessions actives
+persistentManager.swapIn=Basculement depuis le stockage (swap in) de la session [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties Thu Mar 30 09:36:16 2017
@@ -13,23 +13,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059
-fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30d5\u30a1\u30a4\u30eb {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a {0} \u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
-JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u306b\u4fdd\u5b58\u3057\u307e\u3059
-JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
-JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {1} \u304b\u3089\u524a\u9664\u3057\u307e\u3059
-JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc {0}
+fileStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
+fileStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
+fileStore.removing=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30d5\u30a1\u30a4\u30eb [{1}] \u304b\u3089\u524a\u9664\u3057\u307e\u3059
+JDBCStore.close=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a [{0}] \u3092\u30af\u30ed\u30fc\u30ba\u4e2d\u306e\u4f8b\u5916\u3067\u3059
+JDBCStore.saving=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
+JDBCStore.loading=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] \u304b\u3089\u30ed\u30fc\u30c9\u3057\u307e\u3059
+JDBCStore.removing= \u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 [{1}] \u304b\u3089\u524a\u9664\u3057\u307e\u3059
+JDBCStore.SQLException=SQL\u30a8\u30e9\u30fc [{0}]
 JDBCStore.checkConnectionDBClosed=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u304cnull\u3067\u3042\u308b\u304b\u3001\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u308b\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\u518d\u30aa\u30fc\u30d7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u518d\u30aa\u30fc\u30d7\u30f3\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u30c0\u30a6\u30f3\u3057\u3066\u3044\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f {0}
-JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 {0}
+JDBCStore.checkConnectionSQLException=SQL\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f [{0}]
+JDBCStore.checkConnectionClassNotFoundException=JDBC\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 [{0}]
 managerBase.createSession.ise=createSession: \u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059
-managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059 {0}
-standardManager.loading={0} \u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
+managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059 [{0}]
+standardManager.loading=[{0}] \u304b\u3089\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
 standardManager.loading.exception=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bException\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092 {0} \u306b\u4fdd\u5b58\u3057\u307e\u3059
+standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092 [{0}] \u306b\u4fdd\u5b58\u3057\u307e\u3059
 standardManager.managerLoad=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u304b\u3089\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 standardManager.managerUnload=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30a2\u30f3\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 standardSession.attributeEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
@@ -42,18 +42,18 @@ standardSession.getCreationTime.ise=getC
 standardSession.getThisAccessedTime.ise=getThisAccessedTime: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
 standardSession.getLastAccessedTime.ise=getLastAccessedTime: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
 standardSession.getValueNames.ise=getValueNames: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
-standardSession.notSerializable=\u30bb\u30c3\u30b7\u30e7\u30f3 {1} \u306e\u305f\u3081\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027 {0} \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093
+standardSession.notSerializable=\u30bb\u30c3\u30b7\u30e7\u30f3 [{1}] \u306e\u305f\u3081\u306b\u30bb\u30c3\u30b7\u30e7\u30f3\u5c5e\u6027 [{0}] \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093
 standardSession.removeAttribute.ise=removeAttribute: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
 standardSession.sessionEvent=\u30bb\u30c3\u30b7\u30e7\u30f3\u30a4\u30d9\u30f3\u30c8\u30ea\u30b9\u30ca\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
 standardSession.setAttribute.iae=setAttribute: \u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u306a\u3044\u5c5e\u6027\u3067\u3059
 standardSession.setAttribute.ise=setAttribute: \u30bb\u30c3\u30b7\u30e7\u30f3\u306f\u65e2\u306b\u7121\u52b9\u5316\u3055\u308c\u3066\u3044\u307e\u3059
 standardSession.setAttribute.namenull=setAttribute: name\u30d1\u30e9\u30e1\u30bf\u306fnull\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-persistentManager.loading={0} \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
-persistentManager.unloading={0} \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u307e\u3059
-persistentManager.deserializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30c7\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: {1}
-persistentManager.serializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: {1}
-persistentManager.swapMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30b9\u30ef\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-persistentManager.backupMaxIdle={1}\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
-persistentManager.tooManyActive=\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059\u3001{0}\u3001\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3059\u308b\u305f\u3081\u306b\u30a2\u30a4\u30c9\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u63a2\u3057\u3066\u3044\u307e\u3059
-persistentManager.swapTooManyActive=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u308b\u306e\u3067\u3001{1}\u79d2\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3057\u307e\u3059
-persistentManager.swapIn=\u30bb\u30c3\u30b7\u30e7\u30f3 {0} \u3092\u30b9\u30ef\u30c3\u30d7\u30a4\u30f3\u3057\u3066\u3044\u307e\u3059
+persistentManager.loading=[{0}] \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3059
+persistentManager.unloading=[{0}] \u306e\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u307e\u3059
+persistentManager.deserializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30c7\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: [{1}]
+persistentManager.serializeError=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059: [{1}]
+persistentManager.swapMaxIdle=[{1}]\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30b9\u30ef\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+persistentManager.backupMaxIdle=[{1}]\u79d2\u9593\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u4fdd\u5b58\u3059\u308b\u305f\u3081\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
+persistentManager.tooManyActive=\u30a2\u30af\u30c6\u30a3\u30d6\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u307e\u3059\u3001[{0}]\u3001\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3059\u308b\u305f\u3081\u306b\u30a2\u30a4\u30c9\u30eb\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u63a2\u3057\u3066\u3044\u307e\u3059
+persistentManager.swapTooManyActive=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u591a\u3059\u304e\u308b\u306e\u3067\u3001[{1}]\u79d2\u30a2\u30a4\u30c9\u30eb\u3057\u3066\u3044\u308b\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30b9\u30ef\u30c3\u30d7\u30a2\u30a6\u30c8\u3057\u307e\u3059
+persistentManager.swapIn=\u30bb\u30c3\u30b7\u30e7\u30f3 [{0}] \u3092\u30b9\u30ef\u30c3\u30d7\u30a4\u30f3\u3057\u3066\u3044\u307e\u3059

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1789480&r1=1789479&r2=1789480&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Thu Mar 30 09:36:16 2017
@@ -18,27 +18,27 @@ catalina.noCluster=Cluster RuleSet not f
 catalina.serverStartFail=The required Server component failed to start so Tomcat is unable to start.
 catalina.shutdownHookFail=The shutdown hook experienced an error while trying to stop the server
 catalina.stopServer=No shutdown port configured. Shut down server through OS signal. Server not shut down.
-catalina.stopServer.connectException=Could not contact {0}:{1}. Tomcat may not be running.
-contextConfig.altDDNotFound=alt-dd file {0} not found
+catalina.stopServer.connectException=Could not contact [{0}:[{1}]]. Tomcat may not be running.
+contextConfig.altDDNotFound=alt-dd file [{0}] not found
 contextConfig.annotationsStackOverflow=Unable to complete the scan for annotations for web application [{0}] due to a StackOverflowError. Possible root causes include a too low setting for -Xss and illegal cyclic inheritance dependencies. The class hierarchy being processed was [{1}]
 contextConfig.applicationUrl=Unable to determine URL for application web.xml
 contextConfig.applicationMissing=Missing application web.xml, using defaults only
-contextConfig.applicationParse=Parse error in application web.xml file at {0}
-contextConfig.applicationPosition=Occurred at line {0} column {1}
-contextConfig.applicationStart=Parsing application web.xml file at {0}
-contextConfig.authenticatorConfigured=Configured an authenticator for method {0}
-contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of class {0}
-contextConfig.authenticatorMissing=Cannot configure an authenticator for method {0}
+contextConfig.applicationParse=Parse error in application web.xml file at [{0}]
+contextConfig.applicationPosition=Occurred at line [{0}] column [{1}]
+contextConfig.applicationStart=Parsing application web.xml file at [{0}]
+contextConfig.authenticatorConfigured=Configured an authenticator for method [{0}]
+contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of class [{0}]
+contextConfig.authenticatorMissing=Cannot configure an authenticator for method [{0}]
 contextConfig.authenticatorResources=Cannot load authenticators mapping list
 contextConfig.badUrl=Unable to process context descriptor [{0}]
 contextConfig.baseError=Unable to determine location of global configuration (usually $CATALINA_BASE/conf)
-contextConfig.cce=Lifecycle event data object {0} is not a Context
+contextConfig.cce=Lifecycle event data object [{0}] is not a Context
 contextConfig.contextClose=Error closing context.xml
-contextConfig.contextMissing=Missing context.xml: {0}
-contextConfig.contextParse=Parse error in context.xml for {0}
-contextConfig.defaultError=Error processed default web.xml named {0} at {1}
+contextConfig.contextMissing=Missing context.xml: [{0}]
+contextConfig.contextParse=Parse error in context.xml for [{0}]
+contextConfig.defaultError=Error processed default web.xml named [{0}] at [{1}]
 contextConfig.defaultMissing=No global web.xml found
-contextConfig.defaultPosition=Occurred at line {0} column {1}
+contextConfig.defaultPosition=Occurred at line [{0}] column [{1}]
 contextConfig.destroy=ContextConfig: Destroying
 contextConfig.fileUrl=Unable to create a File object from the URL [{0}]
 contextConfig.fixDocBase=Exception fixing docBase for context [{0}]
@@ -52,16 +52,16 @@ contextConfig.invalidSciHandlesTypes=Una
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
 contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
 contextConfig.jndiUrlNotDirContextConn=The connection created for URL [{0}] was not a DirContextURLConnection
-contextConfig.jspFile.error=JSP file {0} must start with a ''/''
-contextConfig.jspFile.warning=WARNING: JSP file {0} must start with a ''/'' in Servlet 2.4
+contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
+contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/'' in Servlet 2.4
 contextConfig.missingRealm=No Realm has been configured to authenticate against
 contextConfig.processAnnotationsDir.debug=Scanning directory for class files with annotations [{0}]
 contextConfig.processAnnotationsJar.debug=Scanning jar file for class files with annotations [{0}]
 contextConfig.processAnnotationsWebDir.debug=Scanning web application directory for class files with annotations [{0}]
 contextConfig.resourceJarFail=Failed to process JAR found at URL [{0}] for static resources to be included in context with name [{1}]
-contextConfig.role.auth=Security role name {0} used in an <auth-constraint> without being defined in a <security-role>
-contextConfig.role.link=Security role name {0} used in a <role-link> without being defined in a <security-role>
-contextConfig.role.runas=Security role name {0} used in a <run-as> without being defined in a <security-role>
+contextConfig.role.auth=Security role name [{0}] used in an <auth-constraint> without being defined in a <security-role>
+contextConfig.role.link=Security role name [{0}] used in a <role-link> without being defined in a <security-role>
+contextConfig.role.runas=Security role name [{0}] used in a <run-as> without being defined in a <security-role>
 contextConfig.sci.debug=Unable to process ServletContainerInitializer for [{0}]. This is most likely due to a class defined in the @HandlesTypes annotation being missing
 contextConfig.sci.info=Unable to process ServletContainerInitializer for [{0}]. This is most likely due to a class defined in the @HandlesTypes annotation being missing. Enable DEBUG level logging for the full stack trace.
 contextConfig.servletContainerInitializerFail=Failed to detect ServletContainerInitializers for context with name [{0}]
@@ -69,16 +69,16 @@ contextConfig.start=ContextConfig: Proce
 contextConfig.stop=ContextConfig: Processing STOP
 contextConfig.unavailable=Marking this application unavailable due to previous error(s)
 contextConfig.unknownUrlProtocol=The URL protocol [{0}] was not recognised during annotation processing. URL [{1}] was ignored.
-contextConfig.urlPatternValue=Both the urlPatterns and value attributes were set for the {0} annotation on class [{1}]
+contextConfig.urlPatternValue=Both the urlPatterns and value attributes were set for the [{0}] annotation on class [{1}]
 contextConfig.webinfClassesUrl=Unable to determine URL for [{0}]
-contextConfig.xmlSettings=Context [{0}] will parse web.xml and web-fragment.xml files with validation:{1} and namespaceAware:{2}
+contextConfig.xmlSettings=Context [{0}] will parse web.xml and web-fragment.xml files with validation:[{1}] and namespaceAware:[{2}]
 embedded.noEngines=No engines have been defined yet
-embedded.notmp=Cannot find specified temporary folder at {0}
+embedded.notmp=Cannot find specified temporary folder at [{0}]
 embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
-engineConfig.cce=Lifecycle event data object {0} is not an Engine
+engineConfig.cce=Lifecycle event data object [{0}] is not an Engine
 engineConfig.start=EngineConfig: Processing START
 engineConfig.stop=EngineConfig: Processing STOP
-expandWar.copy=Error copying {0} to {1}
+expandWar.copy=Error copying [{0}] to [{1}]
 expandWar.createFailed=Unable to create the directory [{0}]
 expandWar.deleteFailed=[{0}] could not be completely deleted. The presence of the remaining files may cause problems
 expandWar.deleteOld=An expanded directory [{0}] was found with a last modified time that did not match the associated WAR. It will be deleted.
@@ -87,29 +87,29 @@ expandWar.missingJarEntry=Cannot get inp
 failedContext.start=Failed to process either the global, per-host or context-specific context.xml file therefore the [{0}] Context cannot be started.
 hostConfig.appBase=Application base [{1}] for host [{0}] does not exist or is not a directory. deployOnStartUp and autoDeploy have been set to false to prevent deployment errors. Other errors may still occur.
 hostConfig.canonicalizing=Unable to determine canonical path for [{0}] while attempting to undeploy [{1}]
-hostConfig.cce=Lifecycle event data object {0} is not a Host
+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.deployDescriptor=Deploying configuration descriptor {0}
+hostConfig.createDirs=Unable to create directory for deployment: [{0}]
+hostConfig.deployDescriptor=Deploying configuration 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.
-hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}
+hostConfig.deployDescriptor.error=Error deploying configuration descriptor [{0}]
 hostConfig.deployDescriptor.threaded.error=Error waiting for multi-thread deployment of context descriptors to complete
-hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the host appBase has been specified, and will be ignored
-hostConfig.deployDescriptor.finished=Deployment of configuration descriptor {0} has finished in {1} ms
-hostConfig.deployDir=Deploying web application directory {0}
-hostConfig.deployDir.error=Error deploying web application directory {0}
+hostConfig.deployDescriptor.localDocBaseSpecified=A docBase [{0}] inside the host appBase has been specified, and will be ignored
+hostConfig.deployDescriptor.finished=Deployment of configuration descriptor [{0}] has finished in [{1}] ms
+hostConfig.deployDir=Deploying web application directory [{0}]
+hostConfig.deployDir.error=Error deploying web application directory [{0}]
 hostConfig.deployDir.threaded.error=Error waiting for multi-thread deployment of directories to complete
-hostConfig.deployDir.finished=Deployment of web application directory {0} has finished in {1} ms
-hostConfig.deployWar=Deploying web application archive {0}
-hostConfig.deployWar.error=Error deploying web application archive {0}
+hostConfig.deployDir.finished=Deployment of web application directory [{0}] has finished in [{1}] ms
+hostConfig.deployWar=Deploying web application archive [{0}]
+hostConfig.deployWar.error=Error deploying web application archive [{0}]
 hostConfig.deployWar.hiddenDir=The directory [{0}] will be ignored because the WAR [{1}] takes priority and unpackWARs is false
 hostConfig.deployWar.threaded.error=Error waiting for multi-thread deployment of WAR files to complete
-hostConfig.deployWar.finished=Deployment of web application archive {0} has finished in {1} ms
-hostConfig.deploy.error=Exception while deploying web application directory {0}
+hostConfig.deployWar.finished=Deployment of web application archive [{0}] has finished in [{1}] ms
+hostConfig.deploy.error=Exception while deploying web application directory [{0}]
 hostConfig.deploying=Deploying discovered web applications
-hostConfig.expand=Expanding web application archive {0}
-hostConfig.expand.error=Exception while expanding web application archive {0}
+hostConfig.expand=Expanding web application archive [{0}]
+hostConfig.expand.error=Exception while expanding web application archive [{0}]
 hostConfig.expanding=Expanding discovered web application archives
 hostConfig.ignorePath=Ignoring path [{0}] in appBase for automatic deployment
 hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ignored.
@@ -123,9 +123,9 @@ hostConfig.resourceNotAbsolute=Unable to
 hostConfig.undeployVersion=Undeploying old version of context [{0}] which has no active session
 passwdUserDatabase.readFail=Failed to obtain a complete set of users from /etc/passwd
 userConfig.database=Exception loading user database
-userConfig.deploy=Deploying web application for user {0}
+userConfig.deploy=Deploying web application for user [{0}]
 userConfig.deploying=Deploying user web applications
-userConfig.error=Error deploying web application for user {0}
+userConfig.error=Error deploying web application for user [{0}]
 userConfig.start=UserConfig: Processing START
 userConfig.stop=UserConfig: Processing STOP
 userConfig.deploy.threaded.error=Error waiting for multi-thread deployment of user directories to complete



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