followup to r896892

Additional message updates for JSP 2.2
Commented-out the untranslated strings in the French file, so that the English ones could be used

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@897093 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index 64d7e0d..c286222 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -109,7 +109,7 @@ jsp.error.unable.load=Unable to load class for JSP
 jsp.error.unable.rename=Unable to rename class file {0} to {1}
 jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
 jsp.error.flush=Exception occurred when flushing data
-jsp.engine.info=Jasper JSP 2.1 Engine
+jsp.engine.info=Jasper JSP 2.2 Engine
 jsp.error.invalid.expression="{0}" contains invalid expression(s): {1}
 jsp.error.invalid.attribute={0} has invalid attribute: {1}
 jsp.error.usebean.class.notfound=Class: {0} not found
@@ -427,7 +427,7 @@ jsp.error.variable.both.name=Cannot specify both name-given or name-from-attribu
 jsp.error.variable.alias=Both or none of the name-from-attribute and alias attributes must be specified in a variable directive
 jsp.error.attribute.null_name=Null attribute name
 jsp.error.jsptext.badcontent=\'<\', when appears in the body of <jsp:text>, must be encapsulated within a CDATA
-jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be \"1.2\", \"2.0\", \"2.1\" or  \"2.2\"
+jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be \"1.2\", \"2.0\", \"2.1\" or \"2.2\"
 jsp.error.noFunctionPrefix=The function {0} must be used with a prefix when a default namespace is not specified
 jsp.error.noFunction=The function {0} cannot be located with the specified prefix
 jsp.error.noFunctionMethod=Method \"{0}\" for function \"{1}\" not found in class \"{2}\"

diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 1286269..67b72f0 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -103,7 +103,7 @@ jsp.error.unable.load = No se puede cargar la clase para JSP
 jsp.error.unable.rename = No se puede renombrar el archivo de clase {0} a {1}
 jsp.error.mandatory.attribute = {0}\: Falta atributo obligatorio {1}
 jsp.error.flush = Excepci\u00F3n sucedida al vaciar los datos
-jsp.engine.info = Motor Jasper JSP 2.1
+jsp.engine.info = Motor Jasper JSP 2.2
 jsp.error.invalid.expression = "{0}" contiene expresiones incorrectas\: {1}
 jsp.error.invalid.attribute = {0}\: Atributo incorrecto, {1}
 jsp.error.usebean.class.notfound = Clase\: {0} no hallada

diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 98e328e..c744341 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -81,7 +81,7 @@ jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
 jsp.error.unable.load=Impossible de charger la classe pour la JSP
 jsp.error.unable.rename=Impossible de renommer le fichier classe de {0} vers {1}
 jsp.error.mandatory.attribute={0}: L''attribut obligatoire {1} est manquant
-jsp.engine.info=Moteur Jasper JSP 2.0
+jsp.engine.info=Moteur Jasper JSP 2.2
 jsp.error.invalid.expression="{0}" contient d''incorrecte(s) expression(s): {1}
 jsp.error.invalid.attribute={0}: Attribut incorrect: {1}
 jsp.error.usebean.class.notfound=Classe: {0} non trouv\u00e9e
@@ -126,7 +126,6 @@ jsp.warning.classDebugInfo=Attention: Valeur incorrecte pour le initParam classd
 jsp.warning.checkInterval=Attention: Valeur incorrecte pour le initParam checkInterval. Utilisation de la valeur par d\u00e9faut \"300\" secondes
 jsp.warning.development=Attention: Valeur incorrecte pour le initParam development. Utilisation de la valeur par d\u00e9faut \"true\"
 jsp.warning.reloading=Attention: Valeur incorrecte pour le initParam reloading. Utilisation de la valeur par d\u00e9faut \"true\"
-jsp.warning.reloading=
 jsp.error.badtaglib=Impossible d''ouvrir le taglibrary {0} : {1}
 jsp.error.badGetReader=Impossible de cr\u00e9er un lecteur (reader) quand le flux n''utilse pas des tampons (not buffered)
 jsp.warning.unknown.element.in.TLD=Attention: El\u00e9ment inconnu {0} dans le TLD
@@ -294,26 +293,26 @@ jsp.error.not.in.template={0} n''est pas autoris\u00e9 dans le corps de texte de
 jsp.error.badStandardAction=L''action n''est pas reconnue comme une action standard.
 jsp.error.tagdirective.badbodycontent=Contenu de corps (body-content) ({0}) invalide dans la directive tag
 jsp.error.config_pagedir_encoding_mismatch=L''encode de page (Page-encoding) indiqu\u00e9 dans le jsp-property-group ({0}) est diff\u00e9rent de celui indiqu\u00e9 dans la directive de page ({1})
-jsp.error.prolog_pagedir_encoding_mismatch=
-jsp.error.prolog_config_encoding_mismatch=
+#jsp.error.prolog_pagedir_encoding_mismatch=
+#jsp.error.prolog_config_encoding_mismatch=
 jsp.error.attribute.custom.non_rt_with_expr=D''apr\u00e8s la TLD, l''attribut {0} n''accepte aucune expression
 jsp.error.scripting.variable.missing_name=Incapable de d\u00e9terminer le nom de variable scripting d''apr\u00e8s l''attribut {0}
 jasper.error.emptybodycontent.nonempty=D''apr\u00e8s la TLD, le tag {0} doit \u00eatre vide, mais ne l''est pas
-jsp.error.tagfile.nameNotUnique=
-jsp.error.tagfile.nameFrom.noAttribute=
-jsp.error.tagfile.nameFrom.badAttribute=
+#jsp.error.tagfile.nameNotUnique=
+#jsp.error.tagfile.nameFrom.noAttribute=
+#jsp.error.tagfile.nameFrom.badAttribute=
 jsp.error.useBean.noSession=Il est ill\u00e9gal pour useBean d''utiliser une port\u00e9e de session (session scope) quand la page JSP indique (via la directive de page) qu''elle ne participe pas aux sessions
 jsp.error.attributes.not.allowed = {0} ne doit avoir aucun attribut
-jsp.error.nested.jspattribute=
-jsp.error.nested.jspbody=
-jsp.error.variable.either.name=
-jsp.error.variable.both.name=
-jsp.error.variable.alias=
-jsp.error.jsptext.badcontent=
-jsp.error.prefix.refined=
-jsp.error.jspoutput.conflict=
-jsp.error.jspoutput.doctypenamesystem=
-jsp.error.jspoutput.doctypepulicsystem=
-jsp.error.jspoutput.nonemptybody=
-jsp.error.jspoutput.invalidUse=
-jsp.error.invalid.bean=
+#jsp.error.nested.jspattribute=
+#jsp.error.nested.jspbody=
+#jsp.error.variable.either.name=
+#jsp.error.variable.both.name=
+#jsp.error.variable.alias=
+#jsp.error.jsptext.badcontent=
+#jsp.error.prefix.refined=
+#jsp.error.jspoutput.conflict=
+#jsp.error.jspoutput.doctypenamesystem=
+#jsp.error.jspoutput.doctypepulicsystem=
+#jsp.error.jspoutput.nonemptybody=
+#jsp.error.jspoutput.invalidUse=
+#jsp.error.invalid.bean=

diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 885117b..e3c5357 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -99,7 +99,7 @@ jsp.error.unable.compile=JSP\u306e\u30af\u30e9\u30b9\u3092\u30b3\u30f3\u30d1\u30
 jsp.error.unable.load=JSP\u306e\u30af\u30e9\u30b9\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
 jsp.error.unable.rename=\u30af\u30e9\u30b9\u30d5\u30a1\u30a4\u30eb {0} \u3092 {1} \u306b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
 jsp.error.mandatory.attribute={0}: \u5fc5\u9808\u5c5e\u6027 {1} \u304c\u3042\u308a\u307e\u305b\u3093
-jsp.engine.info=Jasper JSP 2.0\u30a8\u30f3\u30b8\u30f3
+jsp.engine.info=Jasper JSP 2.2\u30a8\u30f3\u30b8\u30f3
 jsp.error.invalid.expression="{0}" \u306f\u7121\u52b9\u306a\u5f0f\u3092\u542b\u3093\u3067\u3044\u307e\u3059: {1}
 jsp.error.invalid.attribute={0}\u306f\u7121\u52b9\u306a\u5c5e\u6027\u3092\u6301\u3063\u3066\u3044\u307e\u3059: {1}
 jsp.error.usebean.class.notfound=\u30af\u30e9\u30b9: {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
@@ -403,7 +403,7 @@ jsp.error.variable.both.name=variable\u6307\u793a\u5b50\u4e2d\u3067name-given\u3
 jsp.error.variable.alias=name-from-attribute\u304a\u3088\u3073alias\u5c5e\u6027\u306e\u4e21\u65b9\u3092variable\u6307\u793a\u5b50\u4e2d\u306b\u6307\u5b9a\u3059\u308b\u3001\u53c8\u306f\u3069\u3061\u3089\u3082\u6307\u5b9a\u3057\u306a\u3044\u3053\u3068\u304c\u3067\u304d\u307e\u3059
 jsp.error.attribute.null_name=\u7a7a\u306e\u5c5e\u6027\u540d\u3067\u3059
 jsp.error.jsptext.badcontent=\'<\'\u304c<jsp:text>\u306e\u30dc\u30c7\u30a3\u306e\u4e2d\u306b\u73fe\u308c\u308b\u6642\u306f\u3001CDATA\u306e\u4e2d\u306b\u96a0\u853d\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-jsp.error.jsproot.version.invalid=\u7121\u52b9\u306a\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3067\u3059: \"{0}\"\u3001\"1.2\" \u53c8\u306f \"2.0\"\u3000\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
+jsp.error.jsproot.version.invalid=\u7121\u52b9\u306a\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3067\u3059: \"{0}\"\u3001\"1.2\"\u3000\"2.0\"\u3000\"2.1\" \u53c8\u306f \"2.2\"\u3000\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 jsp.error.noFunctionPrefix=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u540d\u524d\u7a7a\u9593\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u6642\u306b\u306f\u3001\u95a2\u6570 {0} \u306f\u30d7\u30ea\u30d5\u30a3\u30af\u30b9\u4ed8\u304d\u3067\u4f7f\u7528\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 jsp.error.noFunction=\u95a2\u6570 {0} \u3092\u6307\u5b9a\u3055\u308c\u305f\u30d7\u30ea\u30d5\u30a3\u30af\u30b9\u3067\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093
 jsp.error.noFunctionMethod=\u95a2\u6570 \"{1}\" \u306e\u30e1\u30bd\u30c3\u30c9 \"{0}\" \u304c \"{2}\" \u4e2d\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093