i18n changes for r1044874

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044881 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index a25967a..02326a1 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -29,9 +29,6 @@ JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
 JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
 managerBase.createRandom=Created random number generator for session ID generation in {0}ms.
 managerBase.createSession.ise=createSession: Too many active sessions
-managerBase.random=Exception initializing random number generator of class [{0}]. Falling back to java.secure.SecureRandom
-managerBase.randomAlgorithm=Exception initializing random number generator using algorithm [{0}] 
-managerBase.randomProviderException initializing random number generator using provider [{0}]
 managerBase.sessionTimeout=Invalid session timeout setting {0}
 serverSession.value.iae=null value
 standardManager.expireException=processsExpire:  Exception during session expiration

diff --git a/java/org/apache/catalina/session/LocalStrings_es.properties b/java/org/apache/catalina/session/LocalStrings_es.properties
index 6b078c2..c3e3d7a 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings_es.properties
+++ b/java/org/apache/catalina/session/LocalStrings_es.properties
@@ -27,7 +27,6 @@ JDBCStore.checkConnectionDBReOpenFail = Fall\u00F3 la reapertura de la base de d
 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.random = Excepci\u00F3n inicializando generador de n\u00FAmeros aleatorios de clase {0}
 managerBase.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de sesi\u00F3n {0}
 serverSession.value.iae = valor nulo
 standardManager.expireException = processsExpire\: Excepci\u00F3n durante la expiraci\u00F3n de sesi\u00F3n

diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties b/java/org/apache/catalina/session/LocalStrings_fr.properties
index ff96f51..f675222 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -27,7 +27,6 @@ JDBCStore.checkConnectionDBReOpenFail=La tentative de r\u00e9ouverture de la bas
 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.random=Exception durant l''initialisation de la classe du g\u00e9n\u00e9rateur de nombre al\u00e9atoire {0}
 managerBase.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9 (timeout) de session invalide {0}
 serverSession.value.iae=valeur nulle
 standardManager.expireException="processsExpire":  Exception lors de l''expiration de la session

diff --git a/java/org/apache/catalina/session/LocalStrings_ja.properties b/java/org/apache/catalina/session/LocalStrings_ja.properties
index b4d08b9..bf11e71 100644 (file)
--- a/java/org/apache/catalina/session/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ JDBCStore.checkConnectionDBReOpenFail=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e
 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.random=\u30af\u30e9\u30b9 {0} \u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059
 managerBase.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059 {0}
 serverSession.value.iae=null\u5024\u3067\u3059
 standardManager.expireException=processsExpire: \u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u7d42\u4e86\u51e6\u7406\u4e2d\u306e\u4f8b\u5916\u3067\u3059

diff --git a/java/org/apache/catalina/util/LocalStrings.properties b/java/org/apache/catalina/util/LocalStrings.properties
index 08705c0..70d9eaa 100644 (file)
--- a/java/org/apache/catalina/util/LocalStrings.properties
+++ b/java/org/apache/catalina/util/LocalStrings.properties
@@ -36,4 +36,7 @@ requestUtil.parseParameters.uee=Unable to parse the parameters since the encodin
 requestUtil.urlDecode.missingDigit=The % character must be followed by two hexademical digits
 requestUtil.urlDecode.uee=Unable to URL decode the specified input since the encoding [{0}] is not supported.
 SecurityUtil.doAsPrivilege=An exception occurs when running the PrivilegedExceptionAction block.
+sessionIdGenerator.random=Exception initializing random number generator of class [{0}]. Falling back to java.secure.SecureRandom
+sessionIdGenerator.randomAlgorithm=Exception initializing random number generator using algorithm [{0}] 
+sessionIdGenerator.randomProviderException initializing random number generator using provider [{0}]
 

diff --git a/java/org/apache/catalina/util/LocalStrings_es.properties b/java/org/apache/catalina/util/LocalStrings_es.properties
index dfa2dd7..604e715 100644 (file)
--- a/java/org/apache/catalina/util/LocalStrings_es.properties
+++ b/java/org/apache/catalina/util/LocalStrings_es.properties
@@ -22,3 +22,4 @@ extensionValidator.extension-not-found-error = ExtensionValidator[{0}][{1}]\: La
 extensionValidator.extension-validation-error = ExtensionValidator[{0}]\: Imposible de hallar la(s) extension(es) {1} requerida(s).
 extensionValidator.failload = No pude cargar la extensi\u00F3n {0}
 SecurityUtil.doAsPrivilege = Una excepci\u00F3n se ha producido durante la ejecuci\u00F3n del bloque PrivilegedExceptionAction.
+sessionIdGenerator.random = Excepci\u00F3n inicializando generador de n\u00FAmeros aleatorios de clase {0}

diff --git a/java/org/apache/catalina/util/LocalStrings_fr.properties b/java/org/apache/catalina/util/LocalStrings_fr.properties
index 0fbc6a1..5053a9d 100644 (file)
--- a/java/org/apache/catalina/util/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/util/LocalStrings_fr.properties
@@ -22,3 +22,4 @@ extensionValidator.web-application-manifest=Web Application Manifest
 extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: L''extension requise "{2}" est introuvable.
 extensionValidator.extension-validation-error=ExtensionValidator[{0}]: Impossible de trouver {1} extension(s) requise(s).
 SecurityUtil.doAsPrivilege=Une exception s''est produite lors de l''execution du bloc PrivilegedExceptionAction.
+sessionIdGenerator.random=Exception durant l''initialisation de la classe du g\u00e9n\u00e9rateur de nombre al\u00e9atoire {0}

diff --git a/java/org/apache/catalina/util/LocalStrings_ja.properties b/java/org/apache/catalina/util/LocalStrings_ja.properties
index c9e86c7..b3799e2 100644 (file)
--- a/java/org/apache/catalina/util/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/util/LocalStrings_ja.properties
@@ -23,4 +23,4 @@ extensionValidator.extension-not-found-error=ExtensionValidator[{0}][{1}]: \u5fc
 extensionValidator.extension-validation-error=ExtensionValidator[{0}]: \u5fc5\u8981\u306a\u62e1\u5f35 "{1}" \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002
 extensionValidator.failload=\u62e1\u5f35 {0} \u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 SecurityUtil.doAsPrivilege=PrivilegedExceptionAction\u30d6\u30ed\u30c3\u30af\u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-
+sessionIdGenerator.random=\u30af\u30e9\u30b9 {0} \u306e\u4e71\u6570\u767a\u751f\u5668\u306e\u521d\u671f\u5316\u306e\u4f8b\u5916\u3067\u3059

diff --git a/java/org/apache/catalina/util/SessionIdGenerator.java b/java/org/apache/catalina/util/SessionIdGenerator.java
index 62d9d95..8d5a429 100644 (file)
--- a/java/org/apache/catalina/util/SessionIdGenerator.java
+++ b/java/org/apache/catalina/util/SessionIdGenerator.java
@@ -202,7 +202,7 @@ public class SessionIdGenerator {
                 Class<?> clazz = Class.forName(secureRandomClass);
                 result = (SecureRandom) clazz.newInstance();
             } catch (Exception e) {
-                log.error(sm.getString("managerBase.random",
+                log.error(sm.getString("sessionIdGenerator.random",
                         secureRandomClass), e);
             }
         }
@@ -219,10 +219,10 @@ public class SessionIdGenerator {
                     result = SecureRandom.getInstance(secureRandomAlgorithm);
                 }
             } catch (NoSuchAlgorithmException e) {
-                log.error(sm.getString("managerBase.randomAlgorithm",
+                log.error(sm.getString("sessionIdGenerator.randomAlgorithm",
                         secureRandomAlgorithm), e);
             } catch (NoSuchProviderException e) {
-                log.error(sm.getString("managerBase.randomProvider",
+                log.error(sm.getString("sessionIdGenerator.randomProvider",
                         secureRandomProvider), e);
             }
         }
@@ -232,7 +232,7 @@ public class SessionIdGenerator {
             try {
                 result = SecureRandom.getInstance("SHA1PRNG");
             } catch (NoSuchAlgorithmException e) {
-                log.error(sm.getString("managerBase.randomAlgorithm",
+                log.error(sm.getString("sessionIdGenerator.randomAlgorithm",
                         secureRandomAlgorithm), e);
             }
         }
@@ -245,7 +245,7 @@ public class SessionIdGenerator {
         if(log.isDebugEnabled()) {
             long t2=System.currentTimeMillis();
             if( (t2-t1) > 100 )
-                log.debug(sm.getString("managerBase.createRandom",
+                log.debug(sm.getString("sessionIdGenerator.createRandom",
                         Long.valueOf(t2-t1)));
         }
         return result;