Author: kkolinko
Date: Sat Feb 9 00:28:04 2013
New Revision: 1444299
URL: http://svn.apache.org/r1444299
Log:
Catch-up merge from 6.0.x/trunk.
Merged all up to r1444297
(+= r1442374-1444291,1444293-1444297 )
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/ (props changed)
tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/branches/tomcat6-testing/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1438411
Merged /tomcat/tc7.0.x/trunk:r1438415
Merged /tomcat/tc6.0.x/trunk:r1442374-1444291,1444293-1444297
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt?rev=1444299&r1=1444298&r2=1444299&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt (original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/BRANCH-README.txt Sat Feb 9
00:28:04 2013
@@ -4,7 +4,7 @@ It is maintained as a reintegrate-able b
merges from tc6.0.x/trunk.
Created: 2012-11-12 from r1408230
-Last catch-up merge: 2013-02-04 (r1442376), merged up to r1442373
+Last catch-up merge: 2013-02-09, merged up to r1444297
Revisions in 6.0.x/trunk that are merges from this branch:
r1417826,1444292
Modified:
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1444299&r1=1444298&r2=1444299&view=diff
==============================================================================
---
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/branches/tomcat6-testing/java/org/apache/catalina/core/LocalStrings_es.properties
Sat Feb 9 00:28:04 2013
@@ -99,7 +99,7 @@ standardContext.notStarted = A\u00fan no
standardContext.notWrapper = El Hijo de un Contexto debe de ser un Arropador
(Wrapper)
standardContext.parameter.duplicate = Duplicado par\u00e1metro de
inicializaci\u00f3n de contexto {0}
standardContext.parameter.required = Es necesario poner nombre de
par\u00e1metro y valor de par\u00e1metro
-standardContext.reloadingCompleted = Se ha completado la Regarga de este
Contexto
+standardContext.reloadingCompleted = Se ha completado la recarga de este
Contexto
standardContext.reloadingFailed = Fall\u00f3 la recarga de este Contexto
debido a errores previos
standardContext.reloadingStarted = Ha comenzado la recarga de Contexto [{0}]
standardContext.resourcesStart = Error arrancando Recursos est\u00e1ticos
Modified: tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml?rev=1444299&r1=1444298&r2=1444299&view=diff
==============================================================================
--- tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml
(original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing/webapps/docs/changelog.xml Sat Feb
9 00:28:04 2013
@@ -73,6 +73,10 @@
or the servlet is a SingleThreadModel one, and of filter instances
if their destroy() method fails with an Error. (kkolinko)
</fix>
+ <fix>
+ <bug>54483</bug>: Correct one of the Spanish translations. Based on a
+ suggestion from adinamita. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
