Author: markt
Date: Mon Oct 24 19:12:25 2011
New Revision: 1188303
URL: http://svn.apache.org/viewvc?rev=1188303&view=rev
Log:
Correct parameter usage in messages.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Oct
24 19:12:25 2011
@@ -30,7 +30,7 @@ applicationContext.setAttribute.namenull
applicationContext.addSessionCookieConfig.ise=Session Cookie configuration
cannot be set for context {0} as the context has been initialised
applicationContext.setSessionTracking.ise=The session tracking modes for
context {0} cannot be set whilst the context is running
applicationContext.setSessionTracking.iae.invalid=The session tracking mode
{0} requested for context {1} is not supported by that context
-applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {1} included SSL and at least one other mode. SSL may not
be configured with other modes.
+applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {0} included SSL and at least one other mode. SSL may not
be configured with other modes.
applicationContext.lookup.error=Failed to locate resource [{0}] in context
[{1}]
applicationDispatcher.allocateException=Allocate exception for servlet {0}
applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Mon
Oct 24 19:12:25 2011
@@ -29,7 +29,7 @@ applicationContext.setAttribute.namenull
applicationContext.addSessionCookieConfig.ise = No se puede poner la
configuraci\u00F3n de Cookie de Sesi\u00F3n para el contexto {0}, una vez que
\u00E9ste ha sido inicializado.
applicationContext.setSessionTracking.ise = No se pueden poner los modos de
seguimiento de sesi\u00F3n para el contexto {0} mientras el contexto se
est\u00E1 ejecutando.
applicationContext.setSessionTracking.iae.invalid = El modo de seguimiento de
sesi\u00F3n {0} requerido para el contexto {1} no est\u00E1 soportado por este
contexto
-applicationContext.setSessionTracking.iae.ssl = Los modos de seguimiento de
sesi\u00F3n requeridos para el contexto {1}, incluy\u00F3 SSL y al menos otro
modo. SSL no se puede configurar con otros modos.
+applicationContext.setSessionTracking.iae.ssl = Los modos de seguimiento de
sesi\u00F3n requeridos para el contexto {0}, incluy\u00F3 SSL y al menos otro
modo. SSL no se puede configurar con otros modos.
applicationContext.lookup.error = No pude localizar el recurso [{0}] en el
contexto [{1}]
applicationDispatcher.allocateException = Excepci\u00F3n de reserva de espacio
para servlet {0}
applicationDispatcher.deallocateException = Excepci\u00F3n de
recuperaci\u00F3n de espacio para servlet {0}
Modified: tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/LocalStrings.properties Mon
Oct 24 19:12:25 2011
@@ -24,7 +24,7 @@ webXml.reservedName=A web.xml file was d
webXml.mergeConflictDisplayName=The display name was defined in multiple
fragments with different values including fragment with name [{0}] located at
[{1}]
webXml.mergeConflictErrorPage=The Error Page for [{0}] was defined
inconsistently in multiple fragments including fragment with name [{1}] located
at [{2}]
webXml.mergeConflictFilter=The Filter [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in
multiple fragments including fragment with name [{0}] located at [{1}]
webXml.mergeConflictOrder=Fragment relative ordering contains circular
references. Thsi can be resolved by using absolute ordering in web.xml.
webXml.mergeConflictResource=The Resource [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
webXml.mergeConflictServlet=The Servlet [{0}] was defined inconsistently in
multiple fragments including fragment with name [{1}] located at [{2}]
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1188303&r1=1188302&r2=1188303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Mon
Oct 24 19:12:25 2011
@@ -29,7 +29,7 @@ farmWarDeployer.msgRxDeploy=Receive clus
farmWarDeployer.msgRxUndeploy=Receive cluster undeployment from path [{0}]
farmWarDeployer.notImplemented=Method [{0}] not yet implemented.
farmWarDeployer.removeStart=Cluster wide remove of web app [{0}]
-farmWarDeployer.removeTxMsg=Send cluster wide undeployment from [{1}]
+farmWarDeployer.removeTxMsg=Send cluster wide undeployment from [{0}]
farmWarDeployer.removeFailRemote=Local remove from [{0}] failed, other manager
has app in service!
farmWarDeployer.removeFailLocal=Local remove from [{0}] failed
farmWarDeployer.removeLocal=Removing webapp [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
