Author: kkolinko
Date: Thu Jun 7 18:02:28 2012
New Revision: 1347741
URL: http://svn.apache.org/viewvc?rev=1347741&view=rev
Log:
Merged revision 1347737 from tomcat/trunk:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=53057
Better wording for OpenSSL version number message that was added in r1312006.
This is because OpenSSL version number includes name of the library.
Sample message:
Old: OpenSSL OpenSSL 1.0.0g 18 Jan 2012 successfully initialized
New: OpenSSL successfully initialized (OpenSSL 1.0.0g 18 Jan 2012)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1347737
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1347741&r1=1347740&r2=1347741&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Thu Jun 7 18:02:28 2012
@@ -65,7 +65,7 @@ aprListener.initializeFIPSFailed=Failed
aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been
initialized
aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already
been initialized
aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been
initialized
-aprListener.initializedOpenSSL=OpenSSL {0} successfully initialized
+aprListener.initializedOpenSSL=OpenSSL successfully initialized ({0})
asyncContextImpl.requestEnded=The request associated with the AsyncContext has
already completed processing.
containerBase.threadedStartFailed=A child container failed during start
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1347741&r1=1347740&r2=1347741&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
Thu Jun 7 18:02:28 2012
@@ -58,7 +58,7 @@ aprListener.aprDestroy = No pude apagar
aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
con la versión APR {1}.
aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}],
aceptar filtros [{2}], aleatorio [{3}].
-aprListener.initializedOpenSSL=OpenSSL {0} inicializado correctamente
+aprListener.initializedOpenSSL=OpenSSL inicializado correctamente ({0})
asyncContextImpl.requestEnded = El requerimiento asociado con AsyncContext ya
ha completado su procesamiento.
containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0}
containerBase.notConfigured = No se ha configurado V\u00E1lvula b\u00E1sica
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
