Author: markt
Date: Wed Mar 29 21:34:18 2017
New Revision: 1789415
URL: http://svn.apache.org/viewvc?rev=1789415&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60932
Correctly escape single quotes when used in i18n messages.
Based on a patch by Michael Osipov.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
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/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/Messages_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -15,7 +15,7 @@
coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the
access log
coyoteAdapter.asyncDispatch=Exception while processing an asynchronous request
coyoteAdapter.authenticate=Authenticated user [{0}] provided by connector
-coyoteAdapter.authorize=Authorizing user [{0}] using Tomcat's Realm
+coyoteAdapter.authorize=Authorizing user [{0}] using Tomcat''s Realm
coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and
recycled it forcedly.
coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and
recycled it forcedly.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
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=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Mar
29 21:34:18 2017
@@ -60,7 +60,7 @@ applicationPushBuilder.methodNotToken=HT
applicationPushBuilder.noCoyoteRequest=Unable to find the underlying Coyote
request object (which is required to create a push request) from the request of
type [{0}]
applicationServletRegistration.setServletSecurity.iae=Null constraint
specified for servlet [{0}] deployed to context with name [{1}]
-applicationServletRegistration.setServletSecurity.ise=Security constraints
can't be added to servlet [{0}] deployed to context with name [{1}] as the
context has already been initialised
+applicationServletRegistration.setServletSecurity.ise=Security constraints
can''t be added to servlet [{0}] deployed to context with name [{1}] as the
context has already been initialised
applicationSessionCookieConfig.ise=Property {0} cannot be added to
SessionCookieConfig for context {1} as the context has been initialised
aprListener.aprInit=The APR based Apache Tomcat Native library which allows
optimal performance in production environments was not found on the
java.library.path: {0}
aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not
be found using names [{0}] on the java.library.path [{1}]. The errors reported
were [{2}]
@@ -141,9 +141,9 @@ standardContext.listenerFail=One or more
standardContext.listenerStart=Exception sending context initialized event to
listener instance of class {0}
standardContext.listenerStop=Exception sending context destroyed event to
listener instance of class {0}
standardContext.loadOnStartup.loadException=Servlet [{1}] in web application
[{0}] threw load() exception
-standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/'
+standardContext.loginConfig.errorPage=Form error page {0} must start with a
''/''
standardContext.loginConfig.errorWarning=WARNING: Form error page {0} must
start with a ''/'' in Servlet 2.4
-standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/'
+standardContext.loginConfig.loginPage=Form login page {0} must start with a
''/''
standardContext.loginConfig.loginWarning=WARNING: Form login page {0} must
start with a ''/'' in Servlet 2.4
standardContext.loginConfig.required=LoginConfig cannot be null
standardContext.manager=Configured a manager of class [{0}]
@@ -188,7 +188,7 @@ standardEngine.notHost=Child of an Engin
standardEngine.notParent=Engine cannot have a parent Container
standardHost.asyncStateError=An asynchronous request was received for
processing that was neither an async dispatch nor an error to process
standardHost.clientAbort=Remote Client Aborted Request, IOException: {0}
-standardHost.invalidErrorReportValveClass=Couldn't load specified error report
valve class: {0}
+standardHost.invalidErrorReportValveClass=Couldn''t load specified error
report valve class: {0}
standardHost.noContext=No Context configured to process this request
standardHost.notContext=Child of a Host must be a Context
standardHost.nullName=Host name is required
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=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Wed
Mar 29 21:34:18 2017
@@ -88,9 +88,9 @@ standardContext.requestListener.requestI
standardContext.isUnavailable = Esta aplicaci\u00F3n no est\u00E1 disponible
en este momento
standardContext.listenerStart = Excepci\u00F3n enviando evento inicializado de
contexto a instancia de escuchador de clase {0}
standardContext.listenerStop = Excepci\u00F3n enviando evento de contexto
destru\u00EDdo a instancia de escuchador de clase {0}
-standardContext.loginConfig.errorPage = La P\u00E1gina de error de Formulario
{0} debe de comenzar con ''/'
+standardContext.loginConfig.errorPage = La P\u00E1gina de error de Formulario
{0} debe de comenzar con ''/''
standardContext.loginConfig.errorWarning = AVISO\: La p\u00E1gina de error de
Formulario {0} debe de comenzar con ''/'' en Servlet 2.4
-standardContext.loginConfig.loginPage = La p\u00E1gina de login de Formulario
{0} debe de comenzar con ''/'
+standardContext.loginConfig.loginPage = La p\u00E1gina de login de Formulario
{0} debe de comenzar con ''/''
standardContext.loginConfig.loginWarning = AVISO\: La p\u00E1gina de login de
Formulario {0} debe de comenzar con ''/'' en Servlet 2.4
standardContext.loginConfig.required = LoginConfig no puede ser nula
standardContext.manager = Configurado un gestor de la clase [{0}]
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Wed
Mar 29 21:34:18 2017
@@ -30,7 +30,7 @@ naming.invalidEnvEntryValue=L''entr\u00e
naming.namingContextCreationFailed=La cr\u00e9ation du contexte de nommage
(naming context) a \u00e9chou\u00e9 : {0}
standardContext.applicationListener=Erreur lors de la configuration de la
classe d''\u00e9coute de l''application (application listener) {0}
standardContext.applicationSkipped=L''installation des \u00e9couteurs
(listeners) de l''application a \u00e9t\u00e9 saut\u00e9e suite aux erreurs
pr\u00e9c\u00e9dentes
-standardContext.errorPage.error=La position de la page d''erreur (ErrorPage)
{0} doit commencer par un ''/'
+standardContext.errorPage.error=La position de la page d''erreur (ErrorPage)
{0} doit commencer par un ''/''
standardContext.errorPage.required=La page d''erreur (ErrorPage) ne peut
\u00eatre nulle
standardContext.errorPage.warning=ATTENTION: La position de la page d''erreur
(ErrorPage) {0} doit commencer par un ''/'' dans l''API Servlet 2.4
standardContext.filterMap.either=L''association de filtre (filter mapping)
doit indiquer soit une <url-pattern> soit une <servlet-name>
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=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -20,7 +20,7 @@ farmWarDeployer.deployEnd=Deployment fro
farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster
subelement!
farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of
[{0}] is an engine!
-farmWarDeployer.mbeanNameFail=Can't construct MBean object name for engine
[{0}] and host [{1}]
+farmWarDeployer.mbeanNameFail=Can''t construct MBean object name for engine
[{0}] and host [{1}]
farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
farmWarDeployer.modInstall=Installing webapp [{0}] from [{1}]
farmWarDeployer.modRemoveFail=No removal
@@ -39,7 +39,7 @@ farmWarDeployer.sendEnd=Send cluster war
farmWarDeployer.sendFragment=Send cluster war fragment path [{0}], war [{1}]
to [{2}]
farmWarDeployer.sendStart=Send cluster war deployment path [{0}], war [{1}]
started.
farmWarDeployer.servicingDeploy=Application [{0}] is being serviced. Touch war
file [{1}] again!
-farmWarDeployer.servicingUndeploy=Application [{0}] is being serviced and
can't be removed from backup cluster node
+farmWarDeployer.servicingUndeploy=Application [{0}] is being serviced and
can''t be removed from backup cluster node
farmWarDeployer.started=Cluster FarmWarDeployer started.
farmWarDeployer.stopped=Cluster FarmWarDeployer stopped.
farmWarDeployer.undeployEnd=Undeployment from [{0}] finished.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
Wed Mar 29 21:34:18 2017
@@ -62,7 +62,7 @@ deltaRequest.ssid.null=Session Id is nul
deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId
[{1}]
deltaSession.readSession=readObject() loading session [{0}]
deltaSession.writeSession=writeObject() storing session [{0}]
-jvmRoute.cannotFindSession=Can't find session [{0}]
+jvmRoute.cannotFindSession=Can''t find session [{0}]
jvmRoute.changeSession=Changed session from [{0}] to [{1}]
jvmRoute.failover=Detected a failover with different jvmRoute - orginal route:
[{0}] new one: [{1}] at session id [{2}]
jvmRoute.foundManager=Found Cluster Manager {0} at {1}
@@ -80,4 +80,4 @@ backupManager.noCluster=no cluster assoc
backupManager.startUnable=Unable to start BackupManager: [{0}]
backupManager.startFailed=Failed to start BackupManager: [{0}]
backupManager.stopped=Manager [{0}] is stopping
-clusterSessionListener.noManager=Context manager doesn't exist:{0}
+clusterSessionListener.noManager=Context manager doesn''t exist:{0}
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -24,7 +24,7 @@ ReplicationValve.nocluster=No cluster co
ReplicationValve.resetDeltaRequest=Cluster is standalone: reset Session
Request Delta at context {0}
ReplicationValve.send.failure=Unable to perform replication request.
ReplicationValve.send.invalid.failure=Unable to send session [id={0}] invalid
message over cluster.
-ReplicationValve.session.found=Context {0}: Found session {1} but it isn't a
ClusterSession.
+ReplicationValve.session.found=Context {0}: Found session {1} but it isn''t a
ClusterSession.
ReplicationValve.session.indicator=Context {0}: Primarity of session {0} in
request attribute {1} is {2}.
ReplicationValve.session.invalid=Context {0}: Requested session {1} is
invalid, removed or not replicated at this node.
ReplicationValve.stats=Average request time= {0} ms for Cluster overhead
time={1} ms for {2} requests {3} filter requests {4} send requests {5} cross
context requests (Request={6} ms Cluster={7} ms).
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties Wed
Mar 29 21:34:18 2017
@@ -24,8 +24,7 @@ ReplicationValve.nocluster = No cluster
ReplicationValve.resetDeltaRequest = Cluster is standalone\: reset Session
Request Delta at context {0}
ReplicationValve.send.failure = Unable to perform replication request.
ReplicationValve.send.invalid.failure = Unable to send session [id\={0}]
invalid message over cluster.
-ReplicationValve.session.found = Context {0}\: Found session {1} but it isn't
a ClusterSession.
+ReplicationValve.session.found = Context {0}\: Found session {1} but it isn''t
a ClusterSession.
ReplicationValve.session.indicator = Context {0}\: Primarity of session {0} in
request attribute {1} is {2}.
ReplicationValve.session.invalid = Context {0}\: Requested session {1} is
invalid, removed or not replicated at this node.
ReplicationValve.stats = Average request time\= {0} ms for Cluster overhead
time\={1} ms for {2} requests {3} filter requests {4} send requests {5} cross
context requests (Request\={6} ms Cluster\={7} ms).
-
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=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Wed Mar
29 21:34:18 2017
@@ -29,7 +29,7 @@ jaasRealm.loginContextCreated=JAAS Login
jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will
use this as the user Principal.
jaasRealm.userPrincipalFailure=No valid user Principal found
-jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user
Principal's roles
+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
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=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -52,7 +52,7 @@ 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.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}]
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties
Wed Mar 29 21:34:18 2017
@@ -44,7 +44,7 @@ contextConfig.invalidSci = No se pudo cr
contextConfig.invalidSciHandlesTypes = No puedo cargar la clase [{0}] para
revisar contra la anotaci\u00F3n @HandlesTypes de uno o m\u00E1s
ServletContentInitializers.
contextConfig.jndiUrl = No puedo procesar la URL JNDI [{0}] para las
anotaciones
contextConfig.jndiUrlNotDirContextConn = La conexi\u00F3n creada para la URL
[{0}] no era una DirContextURLConnection
-contextConfig.jspFile.error = El archivo JSP {0} debe de comenzar con ''/'
+contextConfig.jspFile.error = El archivo JSP {0} debe de comenzar con ''/''
contextConfig.jspFile.warning = AVISO\: El archivo JSP {0} debe de comenzar
con ''/'' en Servlet 2.4
contextConfig.missingRealm = Alg\u00FAn reino (realm) no ha sido configurado
para realizar la autenticaci\u00F3n
contextConfig.resourceJarFail = Hallado JAR fallido a los procesos en URL
[{0}] para recursos est\u00E1ticos a ser incluidos en contexto con nombre [{0}]
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
Wed Mar 29 21:34:18 2017
@@ -42,7 +42,7 @@ tcpFailureDetector.already.disappeared=V
tcpFailureDetector.member.disappeared=Verification complete. Member
disappeared[{0}]
tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the
TcpFailureDetector.
-tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
weren't notified:{0}
+tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
weren''t notified:{0}
tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
tcpFailureDetector.failureDetection.failed=Unable to perform failure detection
check, assuming member down.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
Wed Mar 29 21:34:18 2017
@@ -25,7 +25,7 @@ cache.backgroundEvictFail=The background
cache.objectMaxSizeTooBig=The value of [{0}]kB for objectMaxSize is larger
than the limit of maxSize/20 so has been reduced to [{1}]kB
cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size
to cache [{0}]kB is greater than Integer.MAX_VALUE bytes which is the maximum
size that can be cached. The limit will be set to Integer.MAX_VALUE bytes.
-classpathUrlStreamHandler.notFound=Unable to load the resource [{0}] using the
thread context class loader or the current class's class loader
+classpathUrlStreamHandler.notFound=Unable to load the resource [{0}] using the
thread context class loader or the current class''s class loader
dirResourceSet.manifestFail=Failed to read manifest from [{0}]
dirResourceSet.notDirectory=The directory specified by base and internal path
[{0}]{1}[{2}] does not exist.
Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Wed Mar 29 21:34:18 2017
@@ -29,7 +29,7 @@ error.value.literal.write=ValueExpressio
# ExpressionFactoryImpl
error.null=Expression cannot be null
-error.mixed=Expression cannot contain both '#{..}' and '${..}' : {0}
+error.mixed=Expression cannot contain both ''#{..}'' and ''${..}'' : {0}
error.method=Not a valid MethodExpression : {0}
error.method.nullParms=Parameter types cannot be null
error.value.expectedType=Expected type cannot be null
Modified: tomcat/trunk/java/org/apache/el/Messages_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages_es.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages_es.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages_es.properties Wed Mar 29 21:34:18
2017
@@ -21,7 +21,7 @@ error.resolver.unhandled = ELResolver no
error.resolver.unhandled.null = ELResolver no puede manejar un Objeto base
nulo con identificador de ''{0}''
error.value.literal.write = ValueExpression es un literal y no un grabable\:
{0}
error.null = La expresi\u00F3n no puede ser nula
-error.mixed = La expresi\u00F3n no puede contenera la vez '\#{..}' y '${..}'
\: {0}
+error.mixed = La expresi\u00F3n no puede contenera la vez ''\#{..}'' y
''${..}'' \: {0}
error.method = No es una MethodExpression v\u00E1lida\: {0}
error.method.nullParms = Los tipos de par\u00E1metro no pueden ser nulo
error.value.expectedType = El tipo esperado no puede ser nulo
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -26,31 +26,31 @@ jsp.message.parent_class_loader_is=Paren
jsp.message.dont.modify.servlets=IMPORTANT: Do not modify the generated
servlets
jsp.error.unavailable=JSP has been marked unavailable
jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.invalid.scope=Illegal value of \'scope\' attribute: {0} (must be one
of \"page\", \"request\", \"session\", or \"application\")
+jsp.error.invalid.scope=Illegal value of ''scope'' attribute: {0} (must be one
of \"page\", \"request\", \"session\", or \"application\")
jsp.error.classname=Can't determine classname from .class file
jsp.error.outputfolder=No output folder
jsp.error.data.file.write=Error while writing data file
-jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple
occurrences of 'contentType' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.session=Page directive: illegal to have multiple
occurrences of 'session' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.contenttype=Page directive: illegal to have multiple
occurrences of ''contentType'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.session=Page directive: illegal to have multiple
occurrences of ''session'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.session=Page directive: invalid value for session
-jsp.error.page.conflict.buffer=Page directive: illegal to have multiple
occurrences of 'buffer' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.buffer=Page directive: illegal to have multiple
occurrences of ''buffer'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.buffer=Page directive: invalid value for buffer
-jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple
occurrences of 'autoFlush' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.autoflush=Page directive: illegal to have multiple
occurrences of ''autoFlush'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.import=Page directive: invalid value for import
-jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple
occurrences of 'isThreadSafe' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.isthreadsafe=Page directive: illegal to have multiple
occurrences of ''isThreadSafe'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.isthreadsafe=Page directive: invalid value for
isThreadSafe
-jsp.error.page.conflict.info=Page directive: illegal to have multiple
occurrences of 'info' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.info=Page directive: illegal to have multiple
occurrences of ''info'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.info=Page directive: invalid value for info
-jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple
occurrences of 'isErrorPage' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iserrorpage=Page directive: illegal to have multiple
occurrences of ''isErrorPage'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.iserrorpage=Page directive: invalid value for
isErrorPage
-jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple
occurrences of 'errorPage' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.language=Page directive: illegal to have multiple
occurrences of 'language' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.language=Tag directive: illegal to have multiple
occurrences of 'language' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.errorpage=Page directive: illegal to have multiple
occurrences of ''errorPage'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.language=Page directive: illegal to have multiple
occurrences of ''language'' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.language=Tag directive: illegal to have multiple
occurrences of ''language'' with different values (old: {0}, new: {1})
jsp.error.page.language.nonjava=Page directive: invalid language attribute
jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
-jsp.error.page.conflict.extends=Page directive: illegal to have multiple
occurrences of 'extends' with different values (old: {0}, new: {1})
-jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple
occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple
occurrences of 'isELIgnored' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.extends=Page directive: illegal to have multiple
occurrences of ''extends'' with different values (old: {0}, new: {1})
+jsp.error.page.conflict.iselignored=Page directive: illegal to have multiple
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
+jsp.error.tag.conflict.iselignored=Tag directive: illegal to have multiple
occurrences of ''isELIgnored'' with different values (old: {0}, new: {1})
jsp.error.page.invalid.iselignored=Page directive: invalid value for
isELIgnored
jsp.error.tag.invalid.iselignored=Tag directive: invalid value for isELIgnored
jsp.error.page.multi.pageencoding=Page directive must not have multiple
occurrences of pageencoding
@@ -131,7 +131,7 @@ jsp.warning.unknown.element.in.tagfile=U
jsp.warning.unknown.element.in.attribute=Unknown element ({0}) in attribute
jsp.warning.unknown.element.in.variable=Unknown element ({0}) in variable
jsp.warning.unknown.element.in.validator=Unknown element ({0}) in validator
-jsp.warning.unknown.element.in.initParam=Unknown element ({0}) in validator's
init-param
+jsp.warning.unknown.element.in.initParam=Unknown element ({0}) in validator''s
init-param
jsp.warning.unknown.element.in.function=Unknown element ({0}) in function
jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo
class: {0}
jsp.error.non_null_tei_and_var_subelems=Tag {0} has one or more variable
subelements and a TagExtraInfo class that returns one or more VariableInfo
@@ -238,7 +238,7 @@ jsp.error.taglibDirective.both_uri_and_t
jsp.error.invalid.tagdir=Tag file directory {0} does not start with
\"/WEB-INF/tags\"
#jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}>
cannot have template data. Template data must be encapsulated within a
<jsp:cdata> element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error:
{1}
#Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on
your java platform. An alternate can be specified via the 'javaEncoding'
parameter of JspServlet.
+jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on
your java platform. An alternate can be specified via the ''javaEncoding''
parameter of JspServlet.
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number=An error occurred at line: {0} in the jsp file:
{1}
jsp.error.java.line.number=An error occurred at line: [{0}] in the generated
java file: [{1}]
@@ -249,7 +249,7 @@ jsp.error.jspbody.emptybody.only=The {0}
jsp.error.no.scriptlets=Scripting elements ( <%!, <jsp:declaration,
<%=, <jsp:expression, <%, <jsp:scriptlet ) are disallowed here.
jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in
TLD. Tag Library: {0}, Function: {1}
jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1}
-jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function
signature in TLD. Parenthesis '(' expected. Tag Library: {0}, Function: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function
signature in TLD. Parenthesis ''('' expected. Tag Library: {0}, Function: {1}.
jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or
empty in TLD {1}
jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it
accepts dynamic attributes but does not implement the required interface
jsp.error.attribute.noequal=equal symbol expected
@@ -364,13 +364,13 @@ jsp.error.el.template.deferred=#{...} is
jsp.error.el.parse={0} : {1}
jsp.error.page.invalid.deferredsyntaxallowedasliteral=Page directive: invalid
value for deferredSyntaxAllowedAsLiteral
jsp.error.tag.invalid.deferredsyntaxallowedasliteral=Tag directive: invalid
value for deferredSyntaxAllowedAsLiteral
-jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal
to have multiple occurrences of 'deferredSyntaxAllowedAsLiteral' with different
values (old: {0}, new: {1})
-jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal
to have multiple occurrences of 'deferredSyntaxAllowedAsLiteral' with different
values (old: {0}, new: {1})
+jsp.error.page.conflict.deferredsyntaxallowedasliteral=Page directive: illegal
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with
different values (old: {0}, new: {1})
+jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal
to have multiple occurrences of ''deferredSyntaxAllowedAsLiteral'' with
different values (old: {0}, new: {1})
jsp.error.page.invalid.trimdirectivewhitespaces=Page directive: invalid value
for trimDirectiveWhitespaces
jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value
for trimDirectiveWhitespaces
-jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to
have multiple occurrences of 'trimDirectiveWhitespaces' with different values
(old: {0}, new: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have
multiple occurrences of 'trimDirectiveWhitespaces' with different values (old:
{0}, new: {1})
+jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to
have multiple occurrences of ''trimDirectiveWhitespaces'' with different values
(old: {0}, new: {1})
+jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have
multiple occurrences of ''trimDirectiveWhitespaces'' with different values
(old: {0}, new: {1})
# JSP Servlet
jsp.error.servlet.invalid.method=JSPs only permit GET POST or HEAD
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Mar 29 21:34:18 2017
@@ -25,30 +25,30 @@ jsp.message.parent_class_loader_is = El
jsp.message.dont.modify.servlets = IMPORTANTE\: No modifique los servlets
generados
jsp.error.unavailable = JSP ha sido marcado como no disponible
jsp.error.usebean.duplicate = useBean\: Nombre de bean duplicado\: {0}
-jsp.error.invalid.scope = Valor ilegal de atributo 'scope'\: {0} (debe de ser
uno de "page", "request", "session", o "application")
+jsp.error.invalid.scope = Valor ilegal de atributo ''scope''\: {0} (debe de
ser uno de "page", "request", "session", o "application")
jsp.error.classname = No pude determinar el nombre de clase desde el fichero
.class
jsp.error.outputfolder = no hay carpeta de salida
jsp.error.data.file.write = Error mientras escrib\u00EDa el archivo de datos
-jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'contentType' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.session = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'session' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.contenttype = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo\:
{0}, nuevo\: {1})
+jsp.error.page.conflict.session = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''session'' con valores distintos (viejo\: {0},
nuevo\: {1})
jsp.error.page.invalid.session = Directiva Page\: valor incorrecto para session
-jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'buffer'con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.buffer = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''buffer'' con valores distintos (viejo\: {0},
nuevo\: {1})
jsp.error.page.invalid.buffer = Directiva Page\: valor incorrecto para
b\u00FAfer
-jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'autoFlush' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'isThreadSafe' con valores distintos (viejo\:
{0}, nuevo\: {1})
+jsp.error.page.conflict.autoflush = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.isthreadsafe = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isThreadSafe'' con valores distintos (viejo\:
{0}, nuevo\: {1})
jsp.error.page.invalid.isthreadsafe = \=Directiva Page\: valor incorrecto para
isThreadSafe
-jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples
ocurrencias de 'info' con valores distintos (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.info = Directiva Page\: es ilegal tener m\u00FAltiples
ocurrencias de ''info'' con valores distintos (viejo\: {0}, nuevo\: {1})
jsp.error.page.invalid.info = \=Directiva Page\: valor incorrecto para info
-jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'isErrorPage' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.iserrorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isErrorPage'' con valores distintos (viejo\:
{0}, nuevo\: {1})
jsp.error.page.invalid.iserrorpage = \=Directiva Page\: valor incorrecto para
isErrorPage
-jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'errorPage' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.language = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'language' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de 'language' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.errorpage = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''errorPage'' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.language = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.tag.conflict.language = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de ''language'' con valores distintos (viejo\: {0},
nuevo\: {1})
jsp.error.page.language.nonjava = Directiva Page\: atributo language incorrecto
jsp.error.tag.language.nonjava = Directiva Tag\: atributo language incorrecto
-jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'extends' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0},
nuevo\: {1})
-jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de 'isELIgnored' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.extends = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''extends'' con valores distintos (viejo\: {0},
nuevo\: {1})
+jsp.error.page.conflict.iselignored = Directiva Page\: es ilegal tener
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\:
{0}, nuevo\: {1})
+jsp.error.tag.conflict.iselignored = Directiva Tag\: es ilegal tener
m\u00FAltiples ocurrencias de ''isELIgnored'' con valores distintos (viejo\:
{0}, nuevo\: {1})
jsp.error.page.invalid.iselignored = Directiva Page\: valor inv\u00E1lido para
isELIgnored
jsp.error.tag.invalid.iselignored = Directiva Tag\: valor incorrecto para
isELIgnored
jsp.error.page.multi.pageencoding = La directiva Page no debe de tener
m\u00FAltiples ocurrencias de pageencoding
@@ -229,7 +229,7 @@ jsp.error.taglibDirective.both_uri_and_t
jsp.error.invalid.tagdir = El directorio de archivo Tag {0} no comienza con
"/WEB-INF/tags"
#jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}>
cannot have template data. Template data must be encapsulated within a
<jsp:cdata> element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error:
{1}
#Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding = La codificaci\u00F3n java por defecto
{0} es incorrecta en tu plataforma java. Se puede especificar una alternativa
v\u00EDa par\u00E1metro 'javaEncoding' de JspServlet.
+jsp.error.needAlternateJavaEncoding = La codificaci\u00F3n java por defecto
{0} es incorrecta en tu plataforma java. Se puede especificar una alternativa
v\u00EDa par\u00E1metro ''javaEncoding'' de JspServlet.
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number = Ha tenido lugar un error en la l\u00EDnea\: {0}
en el archivo jsp\: {1}
jsp.error.java.line.number = Ha tenido lugar un error en la l\u00EDnea\: [{0}]
en el fichero java generado: [{1}]
@@ -240,7 +240,7 @@ jsp.error.jspbody.emptybody.only = El ta
jsp.error.no.scriptlets = Los elementos de Scripting (<%\!,
<jsp\:declaration, <%\=, <jsp\:expression, <%, <jsp\:scriptlet )
no est\u00E1n permitidos aqu\u00ED.
jsp.error.tld.fn.invalid.signature = Sint\u00E1xis incorrecta para firma de
funci\u00F3n en TLD. Biblioteca de Tag\: {0}, Funci\u00F3n\: {1}
jsp.error.tld.fn.duplicate.name = Nombre duplicado de funci\u00F3n {0} en
biblioteca de tag {1}
-jsp.error.tld.fn.invalid.signature.parenexpected = Sint\u00E1xis incorrecta
para firma de funci\u00F3n en TLD. Se esperaba Par\u00E9ntesis '('. Biblioteca
de Tag\: {0}, Funci\u00F3n\: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected = Sint\u00E1xis incorrecta
para firma de funci\u00F3n en TLD. Se esperaba Par\u00E9ntesis ''(''.
Biblioteca de Tag\: {0}, Funci\u00F3n\: {1}.
jsp.error.tld.mandatory.element.missing = Falta o est\u00E1 vac\u00EDo
elemento TLD obligatorio\: {0}
jsp.error.dynamic.attributes.not.implemented = El tag {0} declara que acepta
atributos din\u00E1micos pero no implementa la interfaz requerida
jsp.error.attribute.noequal = se esperaba s\u00EDmbolo igual
@@ -349,12 +349,12 @@ jsp.error.el.template.deferred = \#{..}
jsp.error.el.parse = {0} \: {1}
jsp.error.page.invalid.deferredsyntaxallowedasliteral = Directiva de
p\u00E1gina\: valor inv\u00E1lido para deferredSyntaxAllowedAsLiteral
jsp.error.tag.invalid.deferredsyntaxallowedasliteral = Directiva de marca\:
valor inv\u00E1lido para deferredSyntaxAllowedAsLiteral
-jsp.error.page.conflict.deferredsyntaxallowedasliteral = Directiva de
p\u00E1gina\: es ilegal tener m\u00FAltiples ocurrencias de
'deferredSyntaxAllowedAsLiteral' con diferentes valores (viejo\: {0}, nuevo\:
{1})
-jsp.error.tag.conflict.deferredsyntaxallowedasliteral = Directiva de marca\:
es ilegal tener m\u00FAltiples ocurrencias de 'deferredSyntaxAllowedAsLiteral'
con diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.deferredsyntaxallowedasliteral = Directiva de
p\u00E1gina\: es ilegal tener m\u00FAltiples ocurrencias de
''deferredSyntaxAllowedAsLiteral'' con diferentes valores (viejo\: {0}, nuevo\:
{1})
+jsp.error.tag.conflict.deferredsyntaxallowedasliteral = Directiva de marca\:
es ilegal tener m\u00FAltiples ocurrencias de
''deferredSyntaxAllowedAsLiteral'' con diferentes valores (viejo\: {0}, nuevo\:
{1})
jsp.error.page.invalid.trimdirectivewhitespaces = Directiva de p\u00E1gina\:
valor inv\u00E1lido para trimDirectiveWhitespaces
jsp.error.tag.invalid.trimdirectivewhitespaces = Directiva de marca\: valor
inv\u00E1lido para trimDirectiveWhitespaces
-jsp.error.page.conflict.trimdirectivewhitespaces = Directiva de p\u00E1gina\:
es ilegal tener m\u00FAltiples ocurrencias de 'trimDirectivewhitespaces' con
diferentes valores (viejo\: {0}, nuevo\: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces = Directiva de marca\: es
ilegal tener m\u00FAltiples ocurrencias de 'trimDirectivewhitespaces' con
diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.page.conflict.trimdirectivewhitespaces = Directiva de p\u00E1gina\:
es ilegal tener m\u00FAltiples ocurrencias de ''trimDirectivewhitespaces'' con
diferentes valores (viejo\: {0}, nuevo\: {1})
+jsp.error.tag.conflict.trimdirectivewhitespaces = Directiva de marca\: es
ilegal tener m\u00FAltiples ocurrencias de ''trimDirectivewhitespaces'' con
diferentes valores (viejo\: {0}, nuevo\: {1})
jsp.warning.noJarScanner = Aviso\: No se ha puesto
org.apache.tomcat.JarScanner en ServletContext. Volviendo a la
implementaci\u00F3n por defecto de JarScanner.
jsp.error.bug48498 = No puedo mostrar extracto de JSP. Probablemente debido a
un error de analizador XML (ver error 48498 de Tomcat para detalles).
jsp.error.duplicateqname = Se ha hallado un atributo con nombre cualificado
duplicado [{0}]. Los nombres de atributos cuallificados deben de se \u00FAnicos
dentro de un elemento.
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Mar 29 21:34:18 2017
@@ -151,7 +151,7 @@ jsp.error.no.more.content=Fin de contenu
jsp.error.parse.xml=Erreur d''\u00e9valuation XML sur le fichier {0}
jsp.error.parse.xml.line=Erreur d''\u00e9valuation XML sur le fichier {0}:
(ligne {1}, col {2})
jsp.error.parse.xml.scripting.invalid.body=Le corps de l''\u00e9l\u00e9ment
{0} ne doit contenir aucun \u00e9l\u00e9ments XML
-jsp.error.internal.tldinit=Exception lors de l'initialisation de
TldLocationsCache: {0}
+jsp.error.internal.tldinit=Exception lors de l''initialisation de
TldLocationsCache: {0}
jsp.error.internal.filenotfound=Erreur interne: Fichier {0} introuvable
jsp.error.parse.xml.invalidPublicId=PUBLIC ID invalide: {0}
jsp.error.unsupported.encoding=Encodage non support\u00e9: {0}
@@ -161,7 +161,7 @@ jsp.error.taglibDirective.missing.locati
jsp.error.invalid.tagdir=Le r\u00e9pertoire du fichier Tag {0} ne commence pas
par \"/WEB-INF/tags\"
#jspx.error.templateDataNotInJspCdata=Erreur de validation:
l''\u00e9l\u00e9ment <{0}> ne peut avoir de donn\u00e9es template. Les
donn\u00e9es Template doivent \u00eatre encapsul\u00e9es \u00e0
l''int\u00e9rieur d''un \u00e9l\u00e9ment <jsp:cdata>. [JSP1.2 PFD
section 5.1.9]\nDonn\u00e9e Template en erreur: {1}
#Erreur lors du traitement du fichier jar de la taglib {0}: {1}
-jsp.error.needAlternateJavaEncoding=L''encodage java par d\u00e9faut {0} est
incorrect sur votre environnement java. Une alternative peut \u00eatre
indiqu\u00e9e via le param\u00eatre 'javaEncoding' de la JspServlet.
+jsp.error.needAlternateJavaEncoding=L''encodage java par d\u00e9faut {0} est
incorrect sur votre environnement java. Une alternative peut \u00eatre
indiqu\u00e9e via le param\u00eatre ''javaEncoding'' de la JspServlet.
#Erreur lors de la compilation, utilis\u00e9 pour la ligne jsp des messages
d''erreur
jsp.error.single.line.number=Une erreur s''est produite \u00e0 la ligne: {0}
dans le fichier jsp: {1}
jsp.error.corresponding.servlet=Erreur de servlet g\u00e9n\u00e9r\u00e9e:\n
@@ -169,7 +169,7 @@ jsp.error.jspbody.required=Doit utiliser
jsp.error.jspbody.emptybody.only=Le tag {0} ne peut avoir que jsp:attribute
dans son corps.
jsp.error.no.scriptlets=Les \u00e9l\u00e9ments de Scripting ( <%!,
<jsp:declaration, <%=, <jsp:expression, <%, <jsp:scriptlet ) ne sont pas
autoris\u00e9s ici.
jsp.error.tld.fn.invalid.signature=Synthaxe invalide pour la signature de
fonction dans la TLD. Librairie de Tag : {0}, Fonction: {1}
-jsp.error.tld.fn.invalid.signature.parenexpected=Synthaxe invalide pour la
signature de fonction dans la TLD. Parenth\u00e8se '(' attendue. Librairie de
Tag: {0}, Fonction: {1}.
+jsp.error.tld.fn.invalid.signature.parenexpected=Synthaxe invalide pour la
signature de fonction dans la TLD. Parenth\u00e8se ''('' attendue. Librairie
de Tag: {0}, Fonction: {1}.
jsp.error.dynamic.attributes.not.implemented=Le tag {0} indique qu''il accepte
des attributs dynamics mais n''impl\u00e9mente pas l''interface requise
jsp.error.attribute.noequal=Symbole \u00e9gal (equal) attendu
jsp.error.attribute.noquote=Symbole guillemet (quote) attendu
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Wed Mar 29 21:34:18 2017
@@ -25,28 +25,28 @@ jsp.message.parent_class_loader_is=\u89a
jsp.message.dont.modify.servlets=\u91cd\u8981:
\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u5909\u66f4\u3057\u3066\u306f\u3044\u3051\u307e\u305b\u3093
jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
jsp.error.usebean.duplicate=useBean:
beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-jsp.error.invalid.scope='scope'\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
{0}
(\"page\"\u3001\"request\"\u3001\"session\"\u53c8\u306f\"application\"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
+jsp.error.invalid.scope=''scope''\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059:
{0}
(\"page\"\u3001\"request\"\u3001\"session\"\u53c8\u306f\"application\"\u306e\u3069\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093)
jsp.error.classname=.class\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30af\u30e9\u30b9\u540d\u3092\u6c7a\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.data.file.write=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306e\u30a8\u30e9\u30fc\u3067\u3059
-jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
'contentType'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.session=page\u6307\u793a\u5b50:
'session'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.contenttype=page\u6307\u793a\u5b50:
''contentType''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.session=page\u6307\u793a\u5b50:
''session''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.session=page\u6307\u793a\u5b50:
session\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50:
'buffer'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.buffer=page\u6307\u793a\u5b50:
''buffer''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.buffer=page\u6307\u793a\u5b50:
buffer\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50:
'autoFlush'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50:
'isThreadSafe'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.autoflush=page\u6307\u793a\u5b50:
''autoFlush''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.isthreadsafe=page\u6307\u793a\u5b50:
''isThreadSafe''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.isthreadsafe=page\u6307\u793a\u5b50:
isThreadSafe\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.info=page\u6307\u793a\u5b50:
'info'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.info=page\u6307\u793a\u5b50:
''info''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.info=page\u6307\u793a\u5b50:
info\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50:
'isErrorPage'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.iserrorpage=page\u6307\u793a\u5b50:
''isErrorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.iserrorpage=page\u6307\u793a\u5b50:
isErrorPage\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50:
'errorPage'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.errorpage=page\u6307\u793a\u5b50:
''errorPage''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.conflict.language=page\u6307\u793a\u5b50:
'language'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50:
'language'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.tag.conflict.language=tag\u6307\u793a\u5b50:
''language''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.language.nonjava=page\u6307\u793a\u5b50:
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
jsp.error.tag.language.nonjava=tag\u6307\u793a\u5b50:
\u7121\u52b9\u306alanguage\u5c5e\u6027\u3067\u3059
-jsp.error.page.conflict.extends=page\u6307\u793a\u5b50:
'extends'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
-jsp.error.page.conflict.iselignored=page\u6307\u793a\u5b50:
'isELIgnored'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.extends=page\u6307\u793a\u5b50:
''extends''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
+jsp.error.page.conflict.iselignored=page\u6307\u793a\u5b50:
''isELIgnored''\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.tag.conflict.iselignored=tag\u6307\u793a\u5b50:
'isELIgnored'\u3092\u7570\u306a\u308b\u5024\u3067\u8907\u6570\u56de\u6307\u5b9a\u3059\u308b\u306e\u306f\u7121\u52b9\u3067\u3059
(\u65e7: {0}, \u65b0: {1})
jsp.error.page.invalid.iselignored=page\u6307\u793a\u5b50:
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
jsp.error.tag.invalid.iselignored=tag\u6307\u793a\u5b50:
isELIgnored\u306b\u7121\u52b9\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
@@ -205,7 +205,7 @@ jsp.error.taglibDirective.both_uri_and_t
jsp.error.invalid.tagdir=\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
{0} \u304c\"/WEB-INF/tags\"\u3067\u59cb\u307e\u308a\u307e\u305b\u3093
#jspx.error.templateDataNotInJspCdata=Validation Error: Element <{0}>
cannot have template data. Template data must be encapsulated within a
<jsp:cdata> element. [JSP1.2 PFD section 5.1.9]\nTemplate data in error:
{1}
#Error while processing taglib jar file {0}: {1}
-jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
{0}
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u7121\u52b9\u3067\u3059\u3002JspServlet\u306e
'javaEncoding'
\u30d1\u30e9\u30e1\u30bf\u3067\u3001\u5225\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
+jsp.error.needAlternateJavaEncoding=\u30c7\u30d5\u30a9\u30eb\u30c8\u306eJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0
{0}
\u306f\u3042\u306a\u305f\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u306f\u7121\u52b9\u3067\u3059\u3002JspServlet\u306e
''javaEncoding''
\u30d1\u30e9\u30e1\u30bf\u3067\u3001\u5225\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number=JSP\u30d5\u30a1\u30a4\u30eb: {1}
\u306e\u4e2d\u306e{0}\u884c\u76ee\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
jsp.error.corresponding.servlet=\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30a8\u30e9\u30fc\u3067\u3059:\n
@@ -214,7 +214,7 @@ jsp.error.jspbody.emptybody.only={0} \u3
jsp.error.no.scriptlets=\u30b9\u30af\u30ea\u30d7\u30c6\u30a3\u30f3\u30b0\u8981\u7d20
(
<%!\u3001<jsp:declaration\u3001<%=\u3001<jsp:expression\u3001<%\u3001<jsp:scriptlet
) \u306f\u3053\u3053\u3067\u306f\u8a31\u3055\u308c\u307e\u305b\u3093
jsp.error.tld.fn.invalid.signature=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
{0}\u3001\u95a2\u6570: {1}
jsp.error.tld.fn.duplicate.name=\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea {1}
\u306e\u4e2d\u306e\u95a2\u6570\u540d {0}
\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059
-jsp.error.tld.fn.invalid.signature.parenexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u62ec\u5f27
'('
\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
{0}\u3001\u95a2\u6570: {1}\u3002
+jsp.error.tld.fn.invalid.signature.parenexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u62ec\u5f27
''(''
\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30bf\u30b0\u30e9\u30a4\u30d6\u30e9\u30ea:
{0}\u3001\u95a2\u6570: {1}\u3002
jsp.error.tld.mandatory.element.missing=\u5fc5\u9808TLD\u8981\u7d20\u304c\u306a\u3044\u3001\u53c8\u306f\u7a7a\u3067\u3059:
{0}
jsp.error.dynamic.attributes.not.implemented={0}
\u30bf\u30b0\u306f\u305d\u308c\u304cdynamic\u5c5e\u6027\u3092\u53d7\u3051\u4ed8\u3051\u308b\u3068\u5ba3\u8a00\u3057\u3066\u3044\u307e\u3059\u304c\u3001\u305d\u308c\u306b\u5fc5\u8981\u306a\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9\u3092\u5b9f\u88c5\u3057\u3066\u3044\u307e\u305b\u3093
jsp.error.attribute.noequal=\u7b49\u53f7\u8a18\u53f7\u304c\u5fc5\u8981\u3067\u3059
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
Wed Mar 29 21:34:18 2017
@@ -55,7 +55,7 @@ webXml.mergeConflictSessionTimeout=The s
webXml.mergeConflictSessionTrackingMode=The session tracking modes were
defined inconsistently in multiple fragments including fragment with name [{0}]
located at [{1}]
webXml.mergeConflictString=The [{0}] with name [{1}] was defined
inconsistently in multiple fragments including fragment with name [{2}] located
at [{3}]
webXml.multipleOther=Multiple others entries in ordering
-webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known
public ID's for web.xml files so the version could not be identified
+webXml.unrecognisedPublicId=The public ID [{0}] did not match any of the known
public ID''s for web.xml files so the version could not be identified
webXml.version.unknown=Unknown version string [{0}]. Default version will be
used.
webXml.wrongFragmentName=Used a wrong fragment name {0} at web.xml
absolute-ordering tag!
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Wed
Mar 29 21:34:18 2017
@@ -22,7 +22,7 @@ parameters.invalidChunk=Invalid chunk st
parameters.maxCountFail=More than the maximum number of request parameters
(GET plus POST) for a single request ([{0}]) were detected. Any parameters
beyond this limit have been ignored. To change this limit, set the
maxParameterCount attribute on the Connector.
parameters.maxCountFail.fallToDebug=\n Note: further occurrences of this error
will be logged at DEBUG level.
parameters.multipleDecodingFail=Character decoding failed. A total of [{0}]
failures were detected but only the first was logged. Enable debug level
logging for this logger to log all failures.
-parameters.noequal=Parameter starting at position [{0}] and ending at position
[{1}] with a value of [{0}] was not followed by an '=' character
+parameters.noequal=Parameter starting at position [{0}] and ending at position
[{1}] with a value of [{0}] was not followed by an ''='' character
parameters.fallToDebug=\n Note: further occurrences of Parameter errors will
be logged at DEBUG level.
cookies.invalidCookieToken=Cookies: Invalid cookie. Value not a token or
quoted value
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789415&r1=1789414&r2=1789415&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 29 21:34:18 2017
@@ -63,6 +63,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>60932</bug>: Correctly escape single quotes when used in i18n
+ messages. Based on a patch by Michael Osipov. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0.M19 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
