Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties 
Thu Mar 30 10:24:36 2017
@@ -41,40 +41,40 @@ jsp.error.usebean.missing.attribute=useB
 jsp.error.usebean.missing.type=useBean ({0}): Either class or type attribute 
must be \
 specified: 
 jsp.error.usebean.duplicate=useBean: Duplicate bean name: {0}
-jsp.error.usebean.prohibited.as.session=Can't use as session bean {0} since it 
is prohibited \
+jsp.error.usebean.prohibited.as.session=Can''t use as session bean {0} since 
it is prohibited \
 by jsp directive defined earlier: 
 jsp.error.usebean.not.both=useBean: Can't specify both class and beanName 
attribute: 
 jsp.error.usebean.bad.type.cast=useBean ({0}): Type ({1}) is not assignable 
from class ({2}) 
-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.warning.bad.type=Warning: bad type in .class file
 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.contenttype=Page directive: illegal to have multiple 
occurrences of ''contentType'' with different values (old: {0}, new: {1})
 jsp.error.page.invalid.contenttype=Page directive: invalid value for 
contentType
-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.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.autoflush=Page directive: invalid value for autoFlush
 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.defafteruse.language=Page directive: can't define language 
after a scriptlet 
 jsp.error.page.nomapping.language=Page directive: No mapping for language: 
-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
@@ -157,7 +157,7 @@ jsp.error.compilation=Error compiling fi
 jsp.error.setproperty.invalidSyntax=setProperty: can't have non-null value 
when property=*
 jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo for bean {0} not 
found
 jsp.error.setproperty.paramOrValue=setProperty: either param or value can be 
present
-jsp.error.setproperty.arrayVal=setProperty: can't set array property {0} 
through a string constant value
+jsp.error.setproperty.arrayVal=setProperty: can''t set array property {0} 
through a string constant value
 jsp.error.undeclared_namespace=A custom tag was encountered with an undeclared 
namespace [{0}] 
 jsp.warning.keepgen=Warning: Invalid value for the initParam keepgenerated. 
Will use the default value of \"false\"
 jsp.warning.xpoweredBy=Warning: Invalid value for the initParam xpoweredBy. 
Will use the default value of \"false\"
@@ -186,7 +186,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.more.than.one.taglib=More than one taglib in the TLD: {0}
 jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo 
class: {0}
@@ -225,7 +225,7 @@ jsp.error.bad_tag=No tag \"{0}\" defined
 jsp.error.xml.bad_tag=No tag \"{0}\" defined in tag library associated with 
uri \"{1}\"
 jsp.error.bad_string_Character=Cannot extract a Character from a zero length 
array
 jsp.error.bad_string_char=Cannot extract a char from a zero length array
-jsp.warning.compiler.class.cantcreate=Can't create an instance of specified 
compiler plugin class {0} due to {1}. Will default to Sun Java Compiler.
+jsp.warning.compiler.class.cantcreate=Can''t create an instance of specified 
compiler plugin class {0} due to {1}. Will default to Sun Java Compiler.
 jsp.warning.compiler.class.notfound=Specified compiler plugin class {0} not 
found. Will default to Sun Java Compiler.
 jsp.warning.compiler.path.notfound=Specified compiler path {0} not found. Will 
default to system PATH.
 jsp.warning.compiler.classfile.delete.fail=Failed to delete generated class 
file [{0}] 
@@ -323,8 +323,8 @@ jsp.error.unsupported.encoding=Unsupport
 tld.error.variableNotAllowed=It is an error for a tag that has one or more 
variable subelements to have a TagExtraInfo class that returns a non-null 
object.
 jsp.error.tldInWebDotXmlNotFound=Could not locate TLD {1} for URI {0} 
specified in web.xml
 jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: {0} cannot 
be resolved in either web.xml or the jar files deployed with this application
-jsp.error.taglibDirective.missing.location=Neither \'uri\' nor \'tagdir\' 
attribute specified
-jsp.error.taglibDirective.both_uri_and_tagdir=Both \'uri\' and \'tagdir\' 
attributes specified
+jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' 
attribute specified
+jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' 
attributes specified
 jsp.error.invalid.tagdir=Tag file directory {0} does not start with 
\"/WEB-INF/tags\"
 jsp.error.unterminated.user.tag=Unterminated user-defined tag: ending tag {0} 
not found or incorrectly nested
 #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}
@@ -332,7 +332,7 @@ jspx.error.templateDataNotInJspCdata=Val
 #Error while processing taglib jar file {0}: {1}
 jsp.error.taglib.reserved.prefix=The taglib prefix {0} is reserved
 jsp.error.invalid.javaEncoding=Invalid java encodings. Tried {0} and then {1}. 
Both failed.
-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.multiple.line.number=\n\nAn error occurred between lines: {0} and 
{1} in the jsp file: {2}\n\n
@@ -346,8 +346,8 @@ jsp.error.no.scriptlets=Scripting elemen
 jsp.error.internal.unexpected_node_type=Internal Error: Unexpected node type 
encountered
 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.commaexpected=Invalid syntax for function 
signature in TLD.  Comma ',' 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.fn.invalid.signature.commaexpected=Invalid syntax for function 
signature in TLD.  Comma '','' 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.nomatching.fragment=Cannot find an attribute directive (with 
name={0} and fragment=true) prior to the fragment directive.
@@ -466,13 +466,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.destroy.failed=Exception during Servlet.destroy() for JSP 
page
Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
 Thu Mar 30 10:24:36 2017
@@ -42,35 +42,35 @@ jsp.error.usebean.duplicate = useBean\:
 jsp.error.usebean.prohibited.as.session = No puedo usar como bean de 
sesi\u00F3n {0} ya que est\u00E1 prohibido por directiva jsp definida 
previamente\: 
 jsp.error.usebean.not.both = useBean\: No puede especificar ambos atributos 
class y beanName\: 
 jsp.error.usebean.bad.type.cast = useBean ({0})\: Tipo ({1}) no es asignable 
desde clase ({2}) 
-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.warning.bad.type = Aviso\: tipo incorrecto en archivo .class
 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.contenttype = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''contentType'' con valores distintos (viejo\: 
{0}, nuevo\: {1})
 jsp.error.page.invalid.contenttype = Directiva Page\: valor incorrecto para 
contentType
-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.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.autoflush = Directiva Page\: es ilegal tener 
m\u00FAltiples ocurrencias de ''autoFlush'' con valores distintos (viejo\: {0}, 
nuevo\: {1})
 jsp.error.page.invalid.autoflush = \=Directiva Page\: valor incorrecto para 
autoFlush
-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.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.defafteruse.language = Directiva Page\: No puedo definir 
lenguage tras un scriptlet
 jsp.error.page.nomapping.language = Directiva Page\: No hay mapeado para 
language\: 
-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
@@ -329,7 +329,7 @@ jspx.error.templateDataNotInJspCdata = E
 #Error while processing taglib jar file {0}: {1}
 jsp.error.taglib.reserved.prefix = El prefijo taglib {0} est\u00E1 reservado
 jsp.error.invalid.javaEncoding = Codificaciones java incorrectas. Intent\u00E9 
{0} y luego {1}. Ambas fallaron.
-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.multiple.line.number = \n\
@@ -346,8 +346,8 @@ jsp.error.no.scriptlets = Los elementos
 jsp.error.internal.unexpected_node_type = Error Interno\: Encontrado tipo de 
nodo inesperado
 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.commaexpected = Sint\u00E1xis incorrecta 
para firma de funci\u00F3n en TLD. Se esperaba Coma ','. 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.fn.invalid.signature.commaexpected = Sint\u00E1xis incorrecta 
para firma de funci\u00F3n en TLD. Se esperaba Coma '',''. 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.nomatching.fragment = No puedo hallar una directiva de atributo (con 
name\={0} y fragment\=true) antes de la directiva de fragment.
@@ -461,12 +461,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/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
 Thu Mar 30 10:24:36 2017
@@ -238,7 +238,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.internal.evaluator_not_found=Erreur interne: Impossible de charger 
l''\u00e9valuateur d''expression
 jsp.error.parse.xml.invalidPublicId=PUBLIC ID invalide: {0}
@@ -256,19 +256,19 @@ jspx.error.templateDataNotInJspCdata=Err
 #Erreur lors du traitement du fichier jar de la taglib {0}: {1}
 jsp.error.taglib.reserved.prefix=Le pr\u00e9fixe taglib {0} est 
r\u00e9serv\u00e9
 jsp.error.invalid.javaEncoding=Encodage java incorrect. Essai de {0} puis de 
{1}. Les deux ont \u00e9chou\u00e9.
-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.multiple.line.number=\n\nUne erreur s''est produite entre les 
lignes: {0} et {1} dans le fichier jsp: {2}\n\n
 jsp.error.corresponding.servlet=Erreur de servlet g\u00e9n\u00e9r\u00e9e:\n
-jsp.error.empty.body.not.allowed=Un corps vide n'est pas autoris\u00e9 pour {0}
+jsp.error.empty.body.not.allowed=Un corps vide n''est pas autoris\u00e9 pour 
{0}
 jsp.error.jspbody.required=Doit utiliser jsp:body pour indiqu\u00e9 le corps 
de tag body de {0} si jsp:attribute est utilis\u00e9.
 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.internal.unexpected_node_type=Erreur Interne: Type de node inattendu 
rencontr\u00e9
 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.commaexpected=Synthaxe invalide pour la 
signature de fonction dans la TLD.  Virgule ',' 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.tld.fn.invalid.signature.commaexpected=Synthaxe invalide pour la 
signature de fonction dans la TLD.  Virgule '','' 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.nomatching.fragment=Ne peut trouver une directive attribut (avec 
pour nom={0} et fragment=true) avant la directive fragment.
 jsp.error.attribute.noequal=Symbole \u00e9gal (equal) attendu

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
 Thu Mar 30 10:24:36 2017
@@ -42,34 +42,34 @@ jsp.error.usebean.duplicate=useBean: bea
 
jsp.error.usebean.prohibited.as.session=\u4ee5\u524d\u306b\u5b9a\u7fa9\u3057\u305fJSP\u6307\u793a\u5b50\u306b\u3088\u3063\u3066\u7981\u6b62\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u306b\u3001session
 bean {0} \u3068\u3057\u3066\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093:
 jsp.error.usebean.not.both=useBean: 
class\u5c5e\u6027\u3068beanName\u5c5e\u6027\u306e\u4e21\u65b9\u3092\u540c\u6642\u306b\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093:
 jsp.error.usebean.bad.type.cast=useBean ({0}): type ({1}) \u306fclass ({2}) 
\u304b\u3089\u5272\u308a\u5f53\u3066\u3089\u308c\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.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.warning.bad.type=\u8b66\u544a: 
.class\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u578b\u304c\u9055\u3044\u307e\u3059
 
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.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.invalid.contenttype=page\u6307\u793a\u5b50: 
contentType\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-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.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.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.invalid.autoflush=page\u6307\u793a\u5b50: 
autoFlush\u5c5e\u6027\u306e\u5024\u304c\u7121\u52b9\u3067\u3059
-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.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.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.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.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.defafteruse.language=page\u6307\u793a\u5b50: 
scriptlet\u306e\u5f8c\u3067language\u5c5e\u6027\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
 jsp.error.page.nomapping.language=page\u6307\u793a\u5b50 
language\u5c5e\u6027\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u5b58\u5728\u3057\u307e\u305b\u3093:
-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.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
 
jsp.error.page.multi.pageencoding=page\u6307\u793a\u5b50\u306f\u8907\u6570\u306epageencoding\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
@@ -300,7 +300,7 @@ jspx.error.templateDataNotInJspCdata=\u8
 #Error while processing taglib jar file {0}: {1}
 jsp.error.taglib.reserved.prefix=taglib\u30d7\u30ea\u30d5\u30a3\u30af\u30b9 
{0} \u306f\u4e88\u7d04\u3055\u308c\u3066\u3044\u307e\u3059
 
jsp.error.invalid.javaEncoding=\u7121\u52b9\u306aJava\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\u3067\u3059\u3002{0}\u3092\u8a66\u3057\u3066\u3001\u305d\u308c\u304b\u3089{1}\u3092\u8a66\u3057\u307e\u3057\u305f\u304c\u3001\u4e21\u65b9\u304c\u5931\u6557\u3057\u307e\u3057\u305f
-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.multiple.line.number=\n\nJPS\u30d5\u30a1\u30a4\u30eb: 
{2}\u306e\u4e2d\u306e{0}\u884c\u76ee\u3068{1}\u884c\u76ee\u306e\u9593\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n
@@ -312,8 +312,8 @@ jsp.error.no.scriptlets=\u30b9\u30af\u30
 jsp.error.internal.unexpected_node_type=\u5185\u90e8\u30a8\u30e9\u30fc: 
\u672a\u77e5\u306e\u30ce\u30fc\u30c9\u30bf\u30a4\u30d7\u304c\u8868\u308c\u307e\u3057\u305f
 
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.commaexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u30b3\u30f3\u30de
 ',' 
\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.fn.invalid.signature.commaexpected=TLD\u306e\u4e2d\u306e\u95a2\u6570\u30b7\u30b0\u30cd\u30c1\u30e3\u306b\u5bfe\u3059\u308b\u7121\u52b9\u306a\u69cb\u6587\u3067\u3059\u3002\u30b3\u30f3\u30de
 '','' 
\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.nomatching.fragment=attribute\u6307\u793a\u5b50 
(name={0}\u304a\u3088\u3073fragment=true\u3092\u6301\u3064) 
\u304cfragment\u6307\u793a\u5b50\u3088\u308a\u524d\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties 
Thu Mar 30 10:24:36 2017
@@ -43,4 +43,4 @@ standardResources.exists=File base {0} d
 standardResources.notStarted=Resources has not yet been started
 standardResources.null=Document base cannot be null
 standardResources.slash=Document base {0} must not end with a slash
-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

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
Thu Mar 30 10:24:36 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/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
 Thu Mar 30 10:24:36 2017
@@ -18,8 +18,8 @@ endpoint.err.close=Caught exception tryi
 endpoint.err.handshake=Handshake failed
 endpoint.err.unexpected=Unexpected error processing socket
 endpoint.warn.noExector=Failed to process socket [{0}] in state [{1}] because 
the executor had already been shutdown
-endpoint.warn.noDisableCompression='Disable compression' option is not 
supported by the SSL library {0}
-endpoint.warn.noHonorCipherOrder='Honor cipher order' option is not supported 
by the SSL library {0}
+endpoint.warn.noDisableCompression=''Disable compression'' option is not 
supported by the SSL library {0}
+endpoint.warn.noHonorCipherOrder=''Honor cipher order'' option is not 
supported by the SSL library {0}
 endpoint.warn.noInsecureReneg=Secure re-negotiation is not supported by the 
SSL library {0}
 endpoint.warn.unlockAcceptorFailed=Acceptor thread [{0}] failed to unlock. 
Forcing hard socket shutdown.
 endpoint.warn.executorShutdown=The executor associated with thread pool [{0}] 
has not fully shutdown. Some application threads may still be running.

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1789488&r1=1789487&r2=1789488&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 30 10:24:36 2017
@@ -89,6 +89,10 @@
         Correct comments about Java 8 in <code>Jre8Compat</code>.
         Patch provided by fibbers via Github. (violetagg)
       </fix>
+      <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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to