From e2bb5d6cdf8306e358298d3703b89872e495c89a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 20 Dec 2009 16:35:10 +0000
Subject: [PATCH] Revert fix for
 https://issues.apache.org/bugzilla/show_bug.cgi?id=47963 pending a better
 solution

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@892607 13f79535-47bb-0310-9956-ffa450edef68
---
 java/javax/servlet/http/LocalStrings.properties      |  3 +--
 java/javax/servlet/http/LocalStrings_es.properties   |  3 +--
 java/javax/servlet/http/LocalStrings_fr.properties   |  3 +--
 java/javax/servlet/http/LocalStrings_ja.properties   | 14 ++++++--------
 .../catalina/authenticator/LocalStrings.properties   | 10 ++++------
 .../authenticator/LocalStrings_es.properties         |  9 +++------
 .../authenticator/LocalStrings_fr.properties         |  9 +++------
 .../authenticator/LocalStrings_ja.properties         | 15 ++++-----------
 .../org/apache/catalina/core/LocalStrings.properties |  8 --------
 .../apache/catalina/core/LocalStrings_es.properties  |  8 --------
 .../apache/catalina/core/LocalStrings_fr.properties  |  8 --------
 .../apache/catalina/core/LocalStrings_ja.properties  | 20 ++++----------------
 .../apache/catalina/realm/LocalStrings.properties    |  2 --
 .../apache/catalina/realm/LocalStrings_es.properties |  2 --
 .../apache/catalina/realm/LocalStrings_fr.properties |  2 --
 .../apache/catalina/realm/LocalStrings_ja.properties |  5 +----
 .../apache/catalina/valves/LocalStrings.properties   |  4 ----
 .../catalina/valves/LocalStrings_ja.properties       |  5 -----
 .../apache/jasper/resources/LocalStrings.properties  |  2 --
 .../jasper/resources/LocalStrings_es.properties      |  2 --
 .../jasper/resources/LocalStrings_fr.properties      |  2 --
 .../jasper/resources/LocalStrings_ja.properties      |  5 +----
 22 files changed, 29 insertions(+), 112 deletions(-)

diff --git a/java/javax/servlet/http/LocalStrings.properties b/java/javax/servlet/http/LocalStrings.properties
index 05e73d7a4..fc6a9ed38 100644
--- a/java/javax/servlet/http/LocalStrings.properties
+++ b/java/javax/servlet/http/LocalStrings.properties
@@ -21,9 +21,8 @@ err.cookie_name_blank=Cookie name may not be null or zero length
 err.io.negativelength=Negative Length given in write method
 err.io.short_read=Short Read
 
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not supported by the Servlet API 
+
 http.method_get_not_supported=HTTP method GET is not supported by this URL
 http.method_post_not_supported=HTTP method POST is not supported by this URL
 http.method_put_not_supported=HTTP method PUT is not supported by this URL
diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties
index 05b8da722..85cda003f 100644
--- a/java/javax/servlet/http/LocalStrings_es.properties
+++ b/java/javax/servlet/http/LocalStrings_es.properties
@@ -22,9 +22,8 @@ err.cookie_name_is_token=El Nombre de Cookie {0} es una palabra reservada
 err.io.negativelength=Longitud Negativa en el metodo write
 err.io.short_read=Lectura Corta
 
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 http.method_not_implemented=El Metodo {0} no esta definido en la especificacion RFC 2068 y no es soportado por la API Servlet 
+
 http.method_get_not_supported=El Metodo HTTP GET no es soportado por esta URL
 http.method_post_not_supported=El Metodo HTTP POST no es soportado por esta URL
 http.method_put_not_supported=El Metodo HTTP PUT no es soportado por esta URL
diff --git a/java/javax/servlet/http/LocalStrings_fr.properties b/java/javax/servlet/http/LocalStrings_fr.properties
index 32d28a709..47b8dd78a 100644
--- a/java/javax/servlet/http/LocalStrings_fr.properties
+++ b/java/javax/servlet/http/LocalStrings_fr.properties
@@ -20,9 +20,8 @@ err.cookie_name_is_token=Le nom de cookie \"{0}\" est un \"token\" r\u00e9serv\u
 err.io.negativelength=Taille n\u00e9gative donn\u00e9e dans la m\u00e9thode \"write\"
 err.io.short_read=Lecture partielle
 
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 http.method_not_implemented=Le m\u00e9thode {0} n''est pas d\u00e9finie dans la RFC 2068 et n''est pas support\u00e9e par l''API Servlet
+
 http.method_get_not_supported=La m\u00e9thode HTTP GET n''est pas support\u00e9e par cette URL
 http.method_post_not_supported=La m\u00e9thode HTTP POST n''est pas support\u00e9e par cette URL
 http.method_put_not_supported=La m\u00e9thode HTTP PUT n''est pas support\u00e9e par cette URL
diff --git a/java/javax/servlet/http/LocalStrings_ja.properties b/java/javax/servlet/http/LocalStrings_ja.properties
index 3755e8477..70983d785 100644
--- a/java/javax/servlet/http/LocalStrings_ja.properties
+++ b/java/javax/servlet/http/LocalStrings_ja.properties
@@ -20,11 +20,9 @@ err.cookie_name_is_token=\u30af\u30c3\u30ad\u30fc\u540d \"{0}\" \u306f\u4e88\u7d
 err.io.negativelength=write\u30e1\u30bd\u30c3\u30c9\u306b\u8ca0\u306e\u9577\u3055\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002
 err.io.short_read=\u8aad\u307f\u8fbc\u307f\u304c\u3059\u3050\u306b\u7d42\u308f\u308a\u307e\u3057\u305f\u3002
 
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not supported by the Servlet API 
-http.method_get_not_supported=HTTP method GET is not supported by this URL
-http.method_post_not_supported=HTTP method POST is not supported by this URL
-http.method_put_not_supported=HTTP method PUT is not supported by this URL
-http.method_delete_not_supported=Http method DELETE is not supported by this URL
+http.method_not_implemented=\u30e1\u30bd\u30c3\u30c9 {0} \u306fRFC 2068\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8API\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
+
+http.method_get_not_supported=HTTP\u306eGET\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_post_not_supported=HTTP\u306ePOST\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_put_not_supported=HTTP\u306ePUT\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_delete_not_supported=HTTP\u306eDELETE\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/java/org/apache/catalina/authenticator/LocalStrings.properties b/java/org/apache/catalina/authenticator/LocalStrings.properties
index 7685e7d1d..e96e5ed1c 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings.properties
@@ -14,21 +14,19 @@
 # limitations under the License.
 
 authenticator.alreadyStarted=Security Interceptor has already been started
+authenticator.certificates=No client certificate chain in this request
 authenticator.forbidden=Access to the requested resource has been denied
+authenticator.formlogin=Invalid direct reference to form login page
 authenticator.invalid=Invalid client certificate chain in this request
 authenticator.keystore=Exception loading key store
 authenticator.manager=Exception initializing trust managers
 authenticator.notAuthenticated=Configuration error:  Cannot perform access control without an authenticated principal
 authenticator.notContext=Configuration error:  Must be attached to a Context
 authenticator.notStarted=Security Interceptor has not yet been started
-authenticator.userDataConstraint=This request violates a User Data constraint for this application
-
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
-authenticator.certificates=No client certificate chain in this request
-authenticator.formlogin=Invalid direct reference to form login page
 authenticator.requestBodyTooBig=The request body was too large to be cached during the authentication process
 authenticator.sessionExpired=The time allowed for the login process has been exceeded. If you wish to continue you must either click back twice and re-click the link you requested or close and re-open your browser
 authenticator.unauthorized=Cannot authenticate with the provided credentials
+authenticator.userDataConstraint=This request violates a User Data constraint for this application
+
 formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
 formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_es.properties b/java/org/apache/catalina/authenticator/LocalStrings_es.properties
index 8ca934bdf..0997f889f 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_es.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_es.properties
@@ -13,19 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 authenticator.alreadyStarted = El interceptor de seguridad ya ha sido arrancado
+authenticator.certificates = No hay cadena de certificados del cliente en esta petici\u00F3n
 authenticator.forbidden = El acceso al recurso pedido ha sido denegado
+authenticator.formlogin = Referencia directa al formulario de conexi\u00F3n (p\u00E1gina de formulario de login) inv\u00E1lida
 authenticator.invalid = No es v\u00E1lida la cadena de certificados del cliente en esta petici\u00F3n
 authenticator.keystore = Excepci\u00F3n cargando el almac\u00E9n de claves
 authenticator.manager = Excepci\u00F3n inicializando administradores de confianza
 authenticator.notAuthenticated = Error de Configuraci\u00F3n\: No se pueden realizar funciones de control de acceso sin un principal autenticado
 authenticator.notContext = Error de Configuraci\u00F3n\: Debe de estar unido a un Contexto
 authenticator.notStarted = El Interceptor de seguridad no sido a\u00FAn iniciado
-authenticator.userDataConstraint = Esta petici\u00F3n viola una Restrici\u00F3n de Datos de usuario para esta aplicaci\u00F3n
-
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
-authenticator.certificates = No hay cadena de certificados del cliente en esta petici\u00F3n
-authenticator.formlogin = Referencia directa al formulario de conexi\u00F3n (p\u00E1gina de formulario de login) inv\u00E1lida
 authenticator.requestBodyTooBig = El cuerpo del requerimiento era demasiado grande para realizar cach\u00E9 durante el proceso de autenticaci\u00F3n
 authenticator.sessionExpired = El tiempo permitido para realizar login ha sido excedido. Si deseas continuar, debes hacer clik dos veces y volver a hacer clik otra vez o cerrar y reabrir tu navegador
 authenticator.unauthorized = Imposible autenticar mediante las credenciales suministradas
+authenticator.userDataConstraint = Esta petici\u00F3n viola una Restrici\u00F3n de Datos de usuario para esta aplicaci\u00F3n
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
index 8f5e84da2..a13d48663 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
@@ -14,17 +14,14 @@
 # limitations under the License.
 
 authenticator.alreadyStarted=L''intercepteur de s\u00e9curit\u00e9 (security interceptor) a d\u00e9j\u00e0 \u00e9t\u00e9 d\u00e9marr\u00e9
+authenticator.certificates=Aucune cha\u00eene de certificat client (client certificate chain) dans cette requ\u00eate
 authenticator.forbidden=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit
+authenticator.formlogin=R\u00e9f\u00e9rence directe \u00e0 la form de connexion (form login page) invalide
 authenticator.invalid=Cha\u00eene de certificat client invalide dans cette requ\u00eate
 authenticator.keystore=Exception lors du chargement du r\u00e9f\u00e9rentiel de clefs (key store)
 authenticator.manager=Exception lors de l''initialisation des gestionnaires d''authentification (trust managers)
 authenticator.notAuthenticated=Erreur de configuration:  Impossible de proc\u00e9der \u00e0 un contr\u00f4le d''acc\u00e8s sans un principal authentifi\u00e9 (authenticated principal)
 authenticator.notContext=Erreur de configuration:  Doit \u00eatre attach\u00e9 \u00e0 un contexte
 authenticator.notStarted=L''intercepteur de s\u00e9curit\u00e9 (security interceptor) n''a pas encore \u00e9t\u00e9 d\u00e9marr\u00e9
-authenticator.userDataConstraint=Cette requ\u00eate viole une contrainte donn\u00e9e utilisateur (user data constraint) pour cette application
-
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
-authenticator.certificates=Aucune cha\u00eene de certificat client (client certificate chain) dans cette requ\u00eate
-authenticator.formlogin=R\u00e9f\u00e9rence directe \u00e0 la form de connexion (form login page) invalide
 authenticator.unauthorized=Impossible d''authentifier avec les cr\u00e9dits fournis (provided credentials)
+authenticator.userDataConstraint=Cette requ\u00eate viole une contrainte donn\u00e9e utilisateur (user data constraint) pour cette application
diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 0ad6a0138..2363fc579 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -14,22 +14,15 @@
 # limitations under the License.
 
 authenticator.alreadyStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
+authenticator.certificates=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u306f\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u304c\u3042\u308a\u307e\u305b\u3093
 authenticator.forbidden=\u30ea\u30af\u30a8\u30b9\u30c8\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
+authenticator.formlogin=\u30d5\u30a9\u30fc\u30e0\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u3078\u306e\u7121\u52b9\u306a\u76f4\u63a5\u53c2\u7167\u3067\u3059
 authenticator.invalid=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306b\u7121\u52b9\u306a\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u8a8d\u8a3c\u30c1\u30a7\u30fc\u30f3\u304c\u3042\u308a\u307e\u3059
 authenticator.keystore=\u30ad\u30fc\u30b9\u30c8\u30a2\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 authenticator.manager=\u30c8\u30e9\u30b9\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u3092\u521d\u671f\u5316\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 authenticator.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u8a8d\u8a3c\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u306b\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
 authenticator.notContext=\u8a2d\u5b9a\u30a8\u30e9\u30fc: \u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u6307\u5b9a\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 authenticator.notStarted=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a4\u30f3\u30bf\u30fc\u30bb\u30d7\u30bf\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+authenticator.sessionExpired=\u30ed\u30b0\u30a4\u30f3\u30d7\u30ed\u30bb\u30b9\u306b\u8a8d\u3081\u3089\u308c\u3066\u3044\u305f\u6642\u9593\u304c\u904e\u304e\u307e\u3057\u305f\u3002\u7d99\u7d9a\u3057\u305f\u3044\u306a\u3089\u3070\uff0c\u30d0\u30c3\u30af\u30dc\u30bf\u30f3\u30922\u5ea6\u62bc\u3057\u3066\u304b\u3089\u518d\u5ea6\u30ea\u30f3\u30af\u3092\u62bc\u3059\u304b\uff0c\u30d6\u30e9\u30a6\u30b6\u3092\u7acb\u3061\u4e0a\u3052\u76f4\u3057\u3066\u304f\u3060\u3055\u3044
+authenticator.unauthorized=\u7528\u610f\u3055\u308c\u305f\u8a3c\u660e\u66f8\u3067\u8a8d\u8a3c\u3067\u304d\u307e\u305b\u3093
 authenticator.userDataConstraint=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30e6\u30fc\u30b6\u30c7\u30fc\u30bf\u306e\u5236\u9650\u306b\u9055\u53cd\u3057\u3066\u3044\u307e\u3059
-
-# Note: Values below this point may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-authenticator.certificates=No client certificate chain in this request
-authenticator.formlogin=Invalid direct reference to form login page
-authenticator.requestBodyTooBig=The request body was too large to be cached during the authentication process
-authenticator.sessionExpired=The time allowed for the login process has been exceeded. If you wish to continue you must either click back twice and re-click the link you requested or close and re-open your browser
-authenticator.unauthorized=Cannot authenticate with the provided credentials
-formAuthenticator.forwardErrorFail=Unexpected error forwarding to error page
-formAuthenticator.forwardLoginFail=Unexpected error forwarding to login page
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 475b2a8d8..bf961a548 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -29,8 +29,6 @@ applicationDispatcher.deallocateException=Deallocate exception for servlet {0}
 applicationDispatcher.forward.ise=Cannot forward after response has been committed
 applicationDispatcher.forward.throw=Forwarded resource threw an exception
 applicationDispatcher.include.throw=Included resource threw an exception
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 applicationDispatcher.isUnavailable=Servlet {0} is currently unavailable
 applicationDispatcher.serviceException=Servlet.service() for servlet {0} threw exception
 applicationDispatcher.specViolation.request=Original SevletRequest or wrapped original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1
@@ -97,8 +95,6 @@ standardContext.requestListener.requestDestroy=Exception sending request destroy
 standardContext.requestListenerStartFailed=Failed to start request listener valve successfully
 standardContext.requestListenerConfig.added=Added request listener Valve
 standardContext.requestListenerConfig.error=Exception adding request listener Valve: {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardContext.isUnavailable=This application is not currently available
 standardContext.listenerStart=Exception sending context initialized event to listener instance of class {0}
 standardContext.listenerStartFailed=Failed to start application Listeners successfully
@@ -138,8 +134,6 @@ standardContext.wrapper.error=JSP file {0} must start with a ''/'
 standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/'' in Servlet 2.4
 standardEngine.alreadyStarted=Engine has already been started
 standardEngine.mappingError=MAPPING configuration error for server name {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardEngine.noHost=No Host matches server name {0}
 standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
 standardEngine.notHost=Child of an Engine must be a Host
@@ -162,8 +156,6 @@ standardHost.installError=Error deploying application at context path {0}
 standardHost.invalidErrorReportValveClass=Couldn''t load specified error report valve class: {0}
 standardHost.docBase=Document base directory {0} already exists
 standardHost.mappingError=MAPPING configuration error for request URI {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardHost.noContext=No Context configured to process this request
 standardHost.noHost=No Host configured to process this request
 standardHost.notContext=Child of a Host must be a Context
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties b/java/org/apache/catalina/core/LocalStrings_es.properties
index 1fc3ce5cc..5957b777a 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -22,8 +22,6 @@ applicationDispatcher.deallocateException = Excepci\u00F3n de recuperaci\u00F3n
 applicationDispatcher.forward.ise = No puedo reenviar despu\u00E9s de que la respuesta se haya llevado a cabo.
 applicationDispatcher.forward.throw = El recurso reenviado lanz\u00F3 un excepci\u00F3n
 applicationDispatcher.include.throw = El recurso inclu\u00EDdo lanz\u00F3 una excepci\u00F3n
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 applicationDispatcher.isUnavailable = El Servlet {0} no est\u00E1 disponible en este momento
 applicationDispatcher.serviceException = El Servlet.service() para servlet {0} lanz\u00F3 una excepci\u00F3n
 applicationDispatcher.specViolation.request = SevletRequest original o ServletRequest original arropado no pas\u00F3 a RequestDispatcher en violaci\u00F3n de SRV.8.2 y SRV.14.2.5.1
@@ -84,8 +82,6 @@ standardContext.requestListener.requestDestroy = Una excepci\u00F3n durante el e
 standardContext.requestListenerStartFailed = No pude arrancar v\u00E1lvula de escuchador de requerimiento con exito
 standardContext.requestListenerConfig.added = A\u00F1adida V\u00E1lvula de escuchador de requerimiento
 standardContext.requestListenerConfig.error = Excepci\u00F3n a\u00F1adiendo V\u00E1lvula de escuchador de requerimiento\: {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 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.listenerStartFailed = No pude arrancar Escuchadores de aplicaci\u00F3n con \u00E9xito
@@ -125,8 +121,6 @@ standardContext.wrapper.error = El archivo JSP {0} debe de comenzar con ''/'
 standardContext.wrapper.warning = AVISO\: El archivo JSP {0} debe de comenzar con ''/'' en Servlet 2.4
 standardEngine.alreadyStarted = Ya ha sido arrancado el Motor
 standardEngine.mappingError = Error de configuraci\u00F3n de MAPEO para nombre de servidor {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardEngine.noHost = No hay M\u00E1quina que coincida con nombre de servidor {0}
 standardEngine.noHostHeader = Requerimiento HTTP/1.1 sin M\u00E1quina\: cabecera
 standardEngine.notHost = El Hijo de un Motor debe de ser un M\u00E1quina
@@ -149,8 +143,6 @@ standardHost.installError = Error desplegando aplicaci\u00F3n en trayectoria de
 standardHost.invalidErrorReportValveClass = No pude cargar clase especifiada de v\u00E1lvula de informe de error\: {0}
 standardHost.docBase = Ya existe el directorio base de documento {0}
 standardHost.mappingError = Error de configuraci\u00F3n de MAPEO para URI de requerimiento {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardHost.noContext = No se ha configurado Contexto para procesar este requerimiento
 standardHost.noHost = No se ha configurado M\u00E1quina para procesar este requerimiento
 standardHost.notContext = El Hijo de una M\u00E1quina debe de ser un Contexto
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties b/java/org/apache/catalina/core/LocalStrings_fr.properties
index 84f42ffb8..77d48aeb2 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -21,8 +21,6 @@ applicationDispatcher.deallocateException=Exception de d\u00e9sallocation pour l
 applicationDispatcher.forward.ise=Impossible d''utiliser faire-suivre (forward) apr\u00e8s que la r\u00e9ponse ait \u00e9t\u00e9 envoy\u00e9e
 applicationDispatcher.forward.throw=La ressource faire-suivre (forwarded) a lanc\u00e9 une exception
 applicationDispatcher.include.throw=La ressource incluse (included) a lanc\u00e9 une exception
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 applicationDispatcher.isUnavailable=La servlet {0} est actuellement indisponible
 applicationDispatcher.serviceException="Servlet.service()" pour la servlet {0} a lanc\u00e9 une exception
 applicationRequest.badParent=Impossible de trouver l''implementation requ\u00eate apparent\u00e9e (parent request)
@@ -62,8 +60,6 @@ standardContext.filterStartFailed=Echec du d\u00e9marrage des filtres d''applica
 standardContext.requestListenerStartFailed=Echec d\u00e9marrage des Valves d''\u00e9coute
 standardContext.requestListenerConfig.added=Ajout de la valve d''\u00e9coute
 standardContext.requestListenerConfig.error=Exception lors de l''ajout de la valve d''\u00e9coute de requ\u00eate: {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardContext.isUnavailable=Cette application n''est pas disponible actuellement
 standardContext.listenerStart=Exception lors de l''envoi de l''\u00e9v\u00e8nement contexte initialis\u00e9 (context initialized) \u00e0 l''instance de classe d''\u00e9coute (listener) {0}
 standardContext.listenerStartFailed=Echec du d\u00e9marrage des \u00e9couteurs (listeners) d''application
@@ -105,8 +101,6 @@ standardContext.wrapper.error=Le fichier JSP {0} doit commencer par un ''/''
 standardContext.wrapper.warning=ATTENTION: Le fichier JSP {0} doit commencer par un  ''/'' dans l''API Servlet 2.4
 standardEngine.alreadyStarted=Le moteur a d\u00e9j\u00e0 \u00e9t\u00e9 d\u00e9marr\u00e9
 standardEngine.mappingError=Erreur de configuration d''association (mapping configuration) pour le serveur {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardEngine.noHost=Aucune h\u00f4te (host) ne correspond au nom de serveur {0}
 standardEngine.noHostHeader=requ\u00eate HTTP/1.1 sans ent\u00eate Host: 
 standardEngine.notHost=Le fils d''un moteur (child of an Engine) doit \u00eatre un h\u00f4te
@@ -125,8 +119,6 @@ standardHost.installError=Erreur lors du d\u00e9ploiement de l''application pour
 standardHost.invalidErrorReportValveClass=Impossible de charger la classe valve de rapport d''erreur: {0}
 standardHost.docBase=Le r\u00e9pertoire "document base" {0} existe d\u00e9j\u00e0
 standardHost.mappingError=Erreur d''association de configuration (mapping configuration) pour l''URI demand\u00e9e {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 standardHost.noContext=Aucune contexte n''est configur\u00e9 pour traiter cette requ\u00eate
 standardHost.noHost=Aucun h\u00f4te n''est configur\u00e9 pour traiter cette requ\u00eate
 standardHost.notContext=Le fils d''un h\u00f4te (child of a Host) doit \u00eatre un contexte
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties b/java/org/apache/catalina/core/LocalStrings_ja.properties
index 2cf4892f8..551dbf6f7 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -22,10 +22,7 @@ applicationDispatcher.deallocateException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {
 applicationDispatcher.forward.ise=\u30ec\u30b9\u30dd\u30f3\u30b9\u3092\u30b3\u30df\u30c3\u30c8\u3057\u305f\u5f8c\u3067\u30d5\u30a9\u30ef\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
 applicationDispatcher.forward.throw=\u30d5\u30a9\u30ef\u30fc\u30c9\u3057\u305f\u30ea\u30bd\u30fc\u30b9\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
 applicationDispatcher.include.throw=\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3057\u305f\u30ea\u30bd\u30fc\u30b9\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-applicationDispatcher.isUnavailable=Servlet {0} is currently unavailable
+applicationDispatcher.isUnavailable=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
 applicationDispatcher.serviceException=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0} \u306eServlet.service()\u304c\u4f8b\u5916\u3092\u6295\u3052\u307e\u3057\u305f
 applicationRequest.badParent=\u89aa\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u5b9f\u88c5\u3092\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093
 applicationRequest.badRequest=\u30ea\u30af\u30a8\u30b9\u30c8\u304cjavax.servlet.ServletRequestWrapper\u3067\u306f\u3042\u308a\u307e\u305b\u3093
@@ -64,10 +61,7 @@ standardContext.filterStartFailed=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30
 standardContext.requestListenerStartFailed=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 standardContext.requestListenerConfig.added=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
 standardContext.requestListenerConfig.error=\u30ea\u30af\u30a8\u30b9\u30c8\u30ea\u30b9\u30ca\u30d0\u30eb\u30d6\u8ffd\u52a0\u4e2d\u306e\u4f8b\u5916\u3067\u3059: {0}
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-standardContext.isUnavailable=This application is not currently available
+standardContext.isUnavailable=\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u73fe\u5728\u5229\u7528\u3067\u304d\u307e\u305b\u3093
 standardContext.listenerStart=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u521d\u671f\u5316\u30a4\u30d9\u30f3\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
 standardContext.listenerStartFailed=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30ea\u30b9\u30ca\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 standardContext.listenerStop=\u30af\u30e9\u30b9 {0} \u306e\u30ea\u30b9\u30ca\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306b\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u7834\u68c4\u30a4\u30d9\u30f3\u30c8\u3092\u9001\u4fe1\u4e2d\u306e\u4f8b\u5916\u3067\u3059
@@ -108,10 +102,7 @@ standardContext.wrapper.error=JSP\u30d5\u30a1\u30a4\u30eb {0} \u306f''/''\u3067\
 standardContext.wrapper.warning=\u8b66\u544a: Servlet 2.4\u3067\u306fJSP\u30d5\u30a1\u30a4\u30eb {0} \u306f''/''\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 standardEngine.alreadyStarted=\u30a8\u30f3\u30b8\u30f3\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
 standardEngine.mappingError=\u30b5\u30fc\u30d0\u540d {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-standardEngine.noHost=No Host matches server name {0}
+standardEngine.noHost=\u30b5\u30fc\u30d0\u540d {0} \u306b\u4e00\u81f4\u3059\u308b\u30db\u30b9\u30c8\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
 standardEngine.noHostHeader=Host:\u30d8\u30c3\u30c0\u3092\u6301\u305f\u306a\u3044 HTTP/1.1 \u30ea\u30af\u30a8\u30b9\u30c8\u3067\u3059
 standardEngine.notHost=\u30a8\u30f3\u30b8\u30f3\u306e\u5b50\u4f9b\u306f\u30db\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 standardEngine.notParent=\u30a8\u30f3\u30b8\u30f3\u306f\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u3092\u6301\u3064\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
@@ -132,10 +123,7 @@ standardHost.installError=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0} \
 standardHost.invalidErrorReportValveClass=\u6307\u5b9a\u3055\u308c\u305f\u30a8\u30e9\u30fc\u30ea\u30dd\u30fc\u30c8\u30d0\u30eb\u30d6\u30af\u30e9\u30b9\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093: {0}
 standardHost.docBase=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30d9\u30fc\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea {0} \u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059
 standardHost.mappingError=\u30ea\u30af\u30a8\u30b9\u30c8URI {0} \u306e\u30de\u30c3\u30d4\u30f3\u30b0\u8a2d\u5b9a\u30a8\u30e9\u30fc\u3067\u3059
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-standardHost.noContext=No Context configured to process this request
+standardHost.noContext=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306b\u8a2d\u5b9a\u3055\u308c\u305f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
 standardHost.noHost=\u3053\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306b\u8a2d\u5b9a\u3055\u308c\u305f\u30db\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
 standardHost.notContext=\u30db\u30b9\u30c8\u306e\u5b50\u4f9b\u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
 standardHost.notStarted=\u30db\u30b9\u30c8\u304c\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties
index 907a2278e..b2a6c4553 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -68,8 +68,6 @@ memoryRealm.xmlFeatureEncoding=Exception configuring digester to permit java enc
 realmBase.algorithm=Invalid message digest algorithm {0} specified
 realmBase.alreadyStarted=This Realm has already been started
 realmBase.digest=Error digesting user credentials
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 realmBase.forbidden=Access to the requested resource has been denied
 realmBase.hasRoleFailure=Username {0} does NOT have role {1}
 realmBase.hasRoleSuccess=Username {0} has role {1}
diff --git a/java/org/apache/catalina/realm/LocalStrings_es.properties b/java/org/apache/catalina/realm/LocalStrings_es.properties
index 7e9b8d8a5..c3d81c9c0 100644
--- a/java/org/apache/catalina/realm/LocalStrings_es.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_es.properties
@@ -62,8 +62,6 @@ memoryRealm.readXml = Excepci\u00F3n mientras se le\u00EDa el fichero de usuario
 realmBase.algorithm = El algoritmo resumen (digest) {0} es inv\u00E1lido
 realmBase.alreadyStarted = Este dominio ya ha sido inicializado
 realmBase.digest = Error procesando las credenciales del usuario
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 realmBase.forbidden = El acceso al recurso pedido ha sido denegado
 realmBase.hasRoleFailure = El usuario {0} NO desempe\u00F1a el papel de {1}
 realmBase.hasRoleSuccess = El usuario {0} desempe\u00F1a el papel de {1}
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 8faacdcd2..5fd5b4982 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -42,8 +42,6 @@ memoryRealm.readXml=Exception lors de la lecture du fichier base de donn\u00e9es
 realmBase.algorithm=L''algorithme d''empreinte de message (message digest) {0} indiqu\u00e9 est invalide
 realmBase.alreadyStarted=Ce royaume (Realm) a d\u00e9j\u00e0 \u00e9t\u00e9 d\u00e9marr\u00e9
 realmBase.digest=Erreur lors du traitement des empreintes (digest) des cr\u00e9dits utilisateur (user credentials)
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 realmBase.forbidden=L''acc\u00e8s \u00e0 la ressource demand\u00e9e a \u00e9t\u00e9 interdit
 realmBase.hasRoleFailure=Le nom d''utilisateur {0} N''A PAS de r\u00f4le {1}
 realmBase.hasRoleSuccess=Le nom d''utilisateur {0} a pour r\u00f4le {1}
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 1a78416e8..610b8d2cb 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -43,10 +43,7 @@ memoryRealm.readXml=\u30e1\u30e2\u30ea\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5
 realmBase.algorithm=\u7121\u52b9\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a2\u30eb\u30b4\u30ea\u30ba\u30e0 {0} \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059
 realmBase.alreadyStarted=\u3053\u306e\u30ec\u30eb\u30e0\u306f\u65e2\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059
 realmBase.digest=\u30e6\u30fc\u30b6\u306e\u8a3c\u660e\u66f8\u306e\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u30a8\u30e9\u30fc
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-realmBase.forbidden=Access to the requested resource has been denied
+realmBase.forbidden=\u8981\u6c42\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9\u3078\u306e\u30a2\u30af\u30bb\u30b9\u304c\u62d2\u5426\u3055\u308c\u307e\u3057\u305f
 realmBase.hasRoleFailure=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1} \u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
 realmBase.hasRoleSuccess=\u30e6\u30fc\u30b6\u540d {0} \u306f\u30ed\u30fc\u30eb {1} \u3092\u6301\u3063\u3066\u3044\u307e\u3059
 realmBase.notAuthenticated=\u8a2d\u5b9a\u30a8\u30e9\u30fc:  \u8a8d\u8a3c\u3055\u308c\u305f\u4e3b\u4f53\u306a\u3057\u3067\u306f\u30a2\u30af\u30bb\u30b9\u5236\u5fa1\u304c\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 29daffbab..7252cc66d 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -87,7 +87,3 @@ http.503=The requested service ({0}) is not currently available.
 http.504=The server received a timeout from an upstream server while acting as a gateway or proxy ({0}).
 http.505=The server does not support the requested HTTP protocol version ({0}).
 http.507=The resource does not have sufficient space to record the state of the resource after execution of this method ({0}).
-
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
-standardHost.noContext=No Context configured to process this request
diff --git a/java/org/apache/catalina/valves/LocalStrings_ja.properties b/java/org/apache/catalina/valves/LocalStrings_ja.properties
index 10f7a9613..d3182cc8f 100644
--- a/java/org/apache/catalina/valves/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/valves/LocalStrings_ja.properties
@@ -35,8 +35,3 @@ errorReportValve.exception=\u4f8b\u5916
 errorReportValve.rootCause=\u539f\u56e0
 errorReportValve.note=\u6ce8\u610f
 errorReportValve.rootCauseInLogs=\u539f\u56e0\u306e\u3059\u3079\u3066\u306e\u30b9\u30bf\u30c3\u30af\u30c8\u30ec\u30fc\u30b9\u306f\u3001{0}\u306e\u30ed\u30b0\u306b\u8a18\u9332\u3055\u308c\u3066\u3044\u307e\u3059
-
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-standardHost.noContext=No Context configured to process this request
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index 7d743a662..0601ca96e 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -38,8 +38,6 @@ jsp.error.not.impl.setp=Internal error: setProperty not implemented
 jsp.error.not.impl.plugin=Internal error: plugin not implemented
 jsp.error.not.impl.forward=Internal error: forward not implemented
 jsp.error.not.impl.include=Internal error: include not implemented
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 jsp.error.unavailable=JSP has been marked unavailable
 jsp.error.usebean.missing.attribute=useBean: id attribute missing or misspelled
 jsp.error.usebean.missing.type=useBean ({0}): Either class or type attribute must be \
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 45f674560..971575f24 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -36,8 +36,6 @@ jsp.error.not.impl.setp = Error Interno\: setProperty no implementado
 jsp.error.not.impl.plugin = Error Interno\: plugin no implementado
 jsp.error.not.impl.forward = Error Interno\: forward no implementado
 jsp.error.not.impl.include = Error Interno\: include no implementado
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 jsp.error.unavailable = JSP ha sido marcado como no disponible
 jsp.error.usebean.missing.attribute = useBean\: falta atributo id o est\u00E1 mal digitado
 jsp.error.usebean.missing.type = useBean ({0})\: Se debe de especificar atributo class o type\:
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index d2baeb470..98e328edf 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -37,8 +37,6 @@ jsp.error.not.impl.setp=Erreur interne: setProperty non impl\u00e9ment\u00e9
 jsp.error.not.impl.plugin=Erreur interne: plugin non impl\u00e9ment\u00e9
 jsp.error.not.impl.forward=Erreur interne: forward non impl\u00e9ment\u00e9
 jsp.error.not.impl.include=Erreur interne: include non impl\u00e9ment\u00e9
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616
 jsp.error.unavailable=La JSP a \u00e9t\u00e9 marqu\u00e9e comme non disponible
 jsp.error.usebean.missing.attribute=useBean: l''identificateur d''attribut (id attribute) est manquant ou mal orthographi\u00e9
 jsp.error.usebean.missing.type=useBean ({0}): La classe ou le type d''attribut doit \u00eatre\
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 59071940a..93ba81210 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -37,10 +37,7 @@ jsp.error.not.impl.setp=\u5185\u90e8\u30a8\u30e9\u30fc: setProperty\u306f\u5b9f\
 jsp.error.not.impl.plugin=\u5185\u90e8\u30a8\u30e9\u30fc: plugin\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 jsp.error.not.impl.forward=\u5185\u90e8\u30a8\u30e9\u30fc: forward\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 jsp.error.not.impl.include=\u5185\u90e8\u30a8\u30e9\u30fc: include\u306f\u5b9f\u88c5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-# Note: The following value may be used in HTTP headers and as such may only
-#       contain TEXT as defined by RFC 2616. Since Japanese language messages
-#       do not meet this requirement, English text is used.
-jsp.error.unavailable=JSP has been marked unavailable
+jsp.error.unavailable=JSP\u306f\u5229\u7528\u4e0d\u53ef\u3068\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059
 jsp.error.usebean.missing.attribute=useBean: id\u5c5e\u6027\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u30b9\u30da\u30eb\u30df\u30b9\u3067\u3059
 jsp.error.usebean.missing.type=useBean ({0}): class\u5c5e\u6027\u304btype\u5c5e\u6027\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044:
 jsp.error.usebean.duplicate=useBean: beanName\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {0}
-- 
2.11.0