svn commit: r1846398 [1/5] - in /tomcat/trunk: java/javax/el/ java/javax/servlet/ java/javax/servlet/http/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/authenticator/jaspic/ java/org/apache/catalina/connector/ java/org/apache/catali...

[markt]

Author: markt
Date: Mon Nov 12 11:16:39 2018
New Revision: 1846398

URL: http://svn.apache.org/viewvc?rev=1846398&view=rev
Log:
Sort alphabetically (via export-import for translation). Original files with 
the (fewer than I expected) comments retained.

Modified:
    tomcat/trunk/java/javax/el/LocalStrings.properties
    tomcat/trunk/java/javax/servlet/LocalStrings.properties
    tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/mapper/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/security/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/tribes/group/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/tribes/io/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/tribes/jmx/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/tribes/util/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/users/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/util/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/http11/filters/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
    tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
    tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    tomcat/trunk/java/org/apache/naming/LocalStrings.properties
    tomcat/trunk/java/org/apache/naming/factory/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/compat/LocalStrings.properties
    
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/LocalStrings.properties
    
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/file/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/util/scan/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
    tomcat/trunk/webapps/examples/WEB-INF/classes/LocalStrings.properties

Modified: tomcat/trunk/java/javax/el/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/javax/el/LocalStrings.properties [UTF-8] Mon Nov 12 
11:16:39 2018
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default localized string information
-# Localized for Locale en_US
-
-propertyNotFound=Property [{1}] not found on type [{0}]
-propertyNotReadable=Property [{1}] not readable on type [{0}]
-propertyNotWritable=Property [{1}] not writable on type [{0}]
-propertyReadError=Error reading [{1}] on type [{0}]
-propertyWriteError=Error writing [{1}] on type [{0}]
-objectNotAssignable=Unable to add an object of type [{0}] to an array of 
objects of type [{1}]
-
 beanNameELResolver.beanReadOnly=The bean name [{0}] is read-only
+
 elProcessor.defineFunctionInvalidClass=The class [{0}] is not public
 elProcessor.defineFunctionInvalidMethod=The method [{0}] on class [{1}] is not 
a public static method
 elProcessor.defineFunctionInvalidParameterList=The parameter list [{0}] for 
method [{1}] on class [{2}] is not valid
@@ -42,9 +33,16 @@ importHandler.staticNotFound=The static
 
 lambdaExpression.tooFewArgs=Only [{0}] arguments were provided for a lambda 
expression that requires at least [{1}]
 
+objectNotAssignable=Unable to add an object of type [{0}] to an array of 
objects of type [{1}]
+propertyNotFound=Property [{1}] not found on type [{0}]
+propertyNotReadable=Property [{1}] not readable on type [{0}]
+propertyNotWritable=Property [{1}] not writable on type [{0}]
+propertyReadError=Error reading [{1}] on type [{0}]
+propertyWriteError=Error writing [{1}] on type [{0}]
+
 staticFieldELResolver.methodNotFound=No matching public static method named 
[{0}] found on class [{1}]
 staticFieldELResolver.notFound=No public static field named [{0}] was found on 
class [{1}]
 staticFieldELResolver.notWriteable=Writing to static fields (in this case 
field [{0}] on class [{1}]) is not permitted
 
-util.method.notfound=Method not found: {0}.{1}({2})
 util.method.ambiguous=Unable to find unambiguous method: {0}.{1}({2})
+util.method.notfound=Method not found: {0}.{1}({2})

Modified: tomcat/trunk/java/javax/servlet/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/LocalStrings.properties [UTF-8] (original)
+++ tomcat/trunk/java/javax/servlet/LocalStrings.properties [UTF-8] Mon Nov 12 
11:16:39 2018
@@ -13,12 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default localized string information
-# Localized for Locale en_US
-
 err.not_iso8859_1=Not an ISO 8859-1 character: [{0}]
-value.true=true
-value.false=false
 
 httpConstraintElement.invalidRolesDeny=Roles may not be specified when using 
DENY
-httpMethodConstraintElement.invalidMethod=Invalid HTTP method
\ No newline at end of file
+
+httpMethodConstraintElement.invalidMethod=Invalid HTTP method
+
+value.false=false
+value.true=true

Modified: tomcat/trunk/java/javax/servlet/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/javax/servlet/http/LocalStrings.properties [UTF-8] Mon 
Nov 12 11:16:39 2018
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default localized string information
-# Localized for Locale en_US
-
-err.cookie_name_is_token=Cookie name [{0}] is a reserved token
 err.cookie_name_blank=Cookie name may not be null or zero length
-err.io.nullArray=Null passed for byte array in write method
+err.cookie_name_is_token=Cookie name [{0}] is a reserved token
 err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified 
for array of size [{2}]
+err.io.nullArray=Null passed for byte array in write method
 err.io.short_read=Short Read
 
-http.method_not_implemented=Method [{0}] is not implemented by this servlet 
for this URI
-
+http.method_delete_not_supported=Http method DELETE is not supported by this 
URL
 http.method_get_not_supported=HTTP method GET is not supported by this URL
+http.method_not_implemented=Method [{0}] is not implemented by this servlet 
for this URI
 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

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -19,18 +19,18 @@ authenticator.check.authorize=Authorizin
 authenticator.check.authorizeFail=Realm did not recognise user [{0}]. Creating 
a Principal with that name and no roles.
 authenticator.check.found=Already authenticated [{0}]
 authenticator.check.sso=Not authenticated but SSO session ID [{0}] found. 
Attempting re-authentication.
+authenticator.formlogin=Invalid direct reference to form login page
 authenticator.jaspicCleanSubjectFail=Failed to clean JASPIC subject
 authenticator.jaspicSecureResponseFail=Failed to secure response during JASPIC 
processing
 authenticator.jaspicServerAuthContextFail=Failed to obtain a JASPIC 
ServerAuthContext instance
-authenticator.formlogin=Invalid direct reference to form login page
 authenticator.loginFail=Login failed
 authenticator.manager=Exception initializing trust managers
 authenticator.noAuthHeader=No authorization header sent by client
 authenticator.notContext=Configuration error:  Must be attached to a Context
 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.tomcatPrincipalLogoutFail=Logout with TomcatPrincipal instance 
has failed
+authenticator.unauthorized=Cannot authenticate with the provided credentials
 
 basicAuthenticator.invalidCharset=The only permitted values are null, the 
empty string or UTF-8
 
@@ -59,11 +59,11 @@ singleSignOn.debug.removeSession=SSO rem
 singleSignOn.debug.sessionLogout=SSO processing a log out for SSO session 
[{0}] and application session [{1}]
 singleSignOn.debug.sessionTimeout=SSO processing a time out for SSO session 
[{0}] and application session [{1}]
 singleSignOn.debug.update=SSO updating SSO session [{0}] to authentication 
type [{1}]
+singleSignOn.sessionExpire.contextNotFound=SSO unable to expire session [{0}] 
because the Context could not be found
 singleSignOn.sessionExpire.engineNull=SSO unable to expire session [{0}] 
because the Engine was null
 singleSignOn.sessionExpire.hostNotFound=SSO unable to expire session [{0}] 
because the Host could not be found
-singleSignOn.sessionExpire.contextNotFound=SSO unable to expire session [{0}] 
because the Context could not be found
-singleSignOn.sessionExpire.managerNotFound=SSO unable to expire session [{0}] 
because the Manager could not be found
 singleSignOn.sessionExpire.managerError=SSO unable to expire session [{0}] 
because the Manager threw an Exception when searching for the session
+singleSignOn.sessionExpire.managerNotFound=SSO unable to expire session [{0}] 
because the Manager could not be found
 singleSignOn.sessionExpire.sessionNotFound=SSO unable to expire session [{0}] 
because the Session could not be found
 
 spnegoAuthenticator.authHeaderNoToken=The Negotiate authorization header sent 
by the client did not include a token

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
 [UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
 [UTF-8] Mon Nov 12 11:16:39 2018
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 authConfigFactoryImpl.load=Loading persistent provider registrations from [{0}]
-authConfigFactoryImpl.zeroLengthAppContext=A zero length application context 
name is not valid
-authConfigFactoryImpl.zeroLengthMessageLayer=A zero length message layer name 
is not valid
 authConfigFactoryImpl.registerClass=Registering class [{0}] for layer [{1}] 
and application context [{2}]
 authConfigFactoryImpl.registerInstance=Registering instance of type[{0}] for 
layer [{1}] and application context [{2}]
+authConfigFactoryImpl.zeroLengthAppContext=A zero length application context 
name is not valid
+authConfigFactoryImpl.zeroLengthMessageLayer=A zero length message layer name 
is not valid
 
 callbackHandlerImpl.jaspicCallbackMissing=Unsupported JASPIC callback of type 
[{0}] received which was ignored
 
@@ -27,4 +27,4 @@ persistentProviderRegistrations.deleteFa
 persistentProviderRegistrations.existsDeleteFail=The temporary file [{0}] 
already exists and cannot be deleted
 persistentProviderRegistrations.moveFail=Failed to move [{0}] to [{1}]
 
-simpleServerAuthConfig.noModules="No ServerAuthModules configured"
\ No newline at end of file
+simpleServerAuthConfig.noModules="No ServerAuthModules configured"

Modified: 
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -24,40 +24,41 @@ coyoteAdapter.parsePathParam=Unable to p
 
 coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the 
JRE. The Connector will continue to use [{1}]
 coyoteConnector.invalidPort=The connector cannot start since the specified 
port value of [{0}] is invalid
+coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity 
(see RFC 2616 Section 9.6)
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler 
initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler 
instantiation failed
 coyoteConnector.protocolHandlerNoApr=The configured protocol [{0}] requires 
the APR/native library which is not available
-coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
-coyoteConnector.protocolHandlerStopFailed=Protocol handler stop failed
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
 coyoteConnector.protocolHandlerResumeFailed=Protocol handler resume failed
-coyoteConnector.parseBodyMethodNoTrace=TRACE method MUST NOT include an entity 
(see RFC 2616 Section 9.6)
+coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
+coyoteConnector.protocolHandlerStopFailed=Protocol handler stop failed
 
 coyoteInputStream.nbNotready=In non-blocking mode you may not read from the 
ServletInputStream until the previous read has completed and isReady() returns 
true
+
 coyoteOutputStream.nbNotready=In non-blocking mode you may not write to the 
ServletOutputStream until the previous write has completed and isReady() 
returns true
 
+coyoteRequest.alreadyAuthenticated=This request has already been authenticated
+coyoteRequest.attributeEvent=Exception thrown by attributes event listener
+coyoteRequest.authenticate.ise=Cannot call authenticate() after the response 
has been committed
+coyoteRequest.changeSessionId=Cannot change session ID. There is no session 
associated with this request.
+coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size 
of the posted data was too big. Because this request was a chunked request, it 
could not be processed further. Use the maxPostSize attribute of the connector 
to resolve this if the application should accept large POSTs.
+coyoteRequest.filterAsyncSupportUnknown=Unable to determine if any filters do 
not support async processing
 coyoteRequest.getContextPath.ise=Unable to find match between the canonical 
context path [{0}] and the URI presented by the user agent [{1}]
 coyoteRequest.getInputStream.ise=getReader() has already been called for this 
request
 coyoteRequest.getReader.ise=getInputStream() has already been called for this 
request
 coyoteRequest.gssLifetimeFail=Failed to obtain remaining lifetime for user 
principal [{0}]
-coyoteRequest.sessionCreateCommitted=Cannot create a session after the 
response has been committed
-coyoteRequest.changeSessionId=Cannot change session ID. There is no session 
associated with this request.
-coyoteRequest.setAttribute.namenull=Cannot call setAttribute with a null name
-coyoteRequest.attributeEvent=Exception thrown by attributes event listener
-coyoteRequest.parseParameters=Exception thrown whilst processing POSTed 
parameters
-coyoteRequest.postTooLarge=Parameters were not parsed because the size of the 
posted data was too big. Use the maxPostSize attribute of the connector to 
resolve this if the application should accept large POSTs.
-coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size 
of the posted data was too big. Because this request was a chunked request, it 
could not be processed further. Use the maxPostSize attribute of the connector 
to resolve this if the application should accept large POSTs.
-coyoteRequest.alreadyAuthenticated=This request has already been authenticated
-coyoteRequest.authenticate.ise=Cannot call authenticate() after the response 
has been committed
-coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not 
valid
-coyoteRequest.sessionEndAccessFail=Exception triggered ending access to 
session while recycling request
-coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file 
[{0}] specified for use with sendfile
-coyoteRequest.filterAsyncSupportUnknown=Unable to determine if any filters do 
not support async processing
 coyoteRequest.maxPostSizeExceeded=The multi-part request contained parameter 
data (excluding uploaded files) that exceeded the limit for maxPostSize set on 
the associated connector
 coyoteRequest.noAsync=Unable to start async because the following classes in 
the processing chain do not support async [{0}]
 coyoteRequest.noMultipartConfig=Unable to process parts as no multi-part 
configuration has been provided
+coyoteRequest.parseParameters=Exception thrown whilst processing POSTed 
parameters
+coyoteRequest.postTooLarge=Parameters were not parsed because the size of the 
posted data was too big. Use the maxPostSize attribute of the connector to 
resolve this if the application should accept large POSTs.
+coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file 
[{0}] specified for use with sendfile
+coyoteRequest.sessionCreateCommitted=Cannot create a session after the 
response has been committed
+coyoteRequest.sessionEndAccessFail=Exception triggered ending access to 
session while recycling request
+coyoteRequest.setAttribute.namenull=Cannot call setAttribute with a null name
 coyoteRequest.trailersNotReady=It is illegal to call getTrailerFields() before 
isTrailerFieldsReady() has returned true
+coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not 
valid
 
 coyoteResponse.encoding.invalid=The encoding [{0}] is not recognised by the JRE
 coyoteResponse.getOutputStream.ise=getWriter() has already been called for 
this response
@@ -69,8 +70,8 @@ coyoteResponse.sendRedirect.ise=Cannot c
 coyoteResponse.sendRedirect.note=<html><body><p>Redirecting to <a 
href="{0}">{0}</a></p></body></html>
 coyoteResponse.setBufferSize.ise=Cannot change buffer size after data has been 
written
 
-inputBuffer.streamClosed=Stream closed
 inputBuffer.requiresNonBlocking=Not available in non blocking mode
+inputBuffer.streamClosed=Stream closed
 
 outputBuffer.writeNull=The String argument to write(String,int,int) may not be 
null
 

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8] 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties [UTF-8] 
Mon Nov 12 11:16:39 2018
@@ -17,8 +17,8 @@ applicationContext.addFilter.ise=Filters
 applicationContext.addJspFile.iae=The JSP file [{0}] is not valid
 applicationContext.addListener.iae.cnfe=Unable to create an instance of type 
[{0}]
 applicationContext.addListener.iae.init=Unable to add an instance of type 
[{0}] as a listener
-applicationContext.addListener.iae.wrongType=The type specified [{0}] is not 
one of the expected listener types
 applicationContext.addListener.iae.sclNotAllowed=Once the first 
ServletContextListener has been called, no more ServletContextListeners may be 
added.
+applicationContext.addListener.iae.wrongType=The type specified [{0}] is not 
one of the expected listener types
 applicationContext.addListener.ise=Listeners cannot be added to context [{0}] 
as the context has been initialised
 applicationContext.addRole.ise=Roles cannot be added to context [{0}] as the 
context has been initialised
 applicationContext.addServlet.ise=Servlets cannot be added to context [{0}] as 
the context has been initialised
@@ -26,6 +26,7 @@ applicationContext.attributeEvent=Except
 applicationContext.illegalDispatchPath=An application attempted to obtain a 
request dispatcher with an illegal path [{0}] that was rejected because it 
contained an encoded directory traversal attempt
 applicationContext.invalidFilterName=Unable to add filter definition due to 
invalid filter name [{0}].
 applicationContext.invalidServletName=Unable to add servlet definition due to 
invalid servlet name [{0}].
+applicationContext.lookup.error=Failed to locate resource [{0}] in context 
[{1}]
 applicationContext.mapping.error=Error during mapping
 applicationContext.requestDispatcher.iae=Path [{0}] does not start with a "/" 
character
 applicationContext.resourcePaths.iae=Path [{0}] does not start with a "/" 
character
@@ -36,10 +37,10 @@ applicationContext.setInitParam.ise=Init
 applicationContext.setRequestEncoding.ise=The request encoding cannot be set 
for context [{0}] as the context has been initialised
 applicationContext.setResponseEncoding.ise=The response encoding cannot be set 
for context [{0}] as the context has been initialised
 applicationContext.setSessionTimeout.ise=The session timeout cannot be set for 
context [{0}] as the context has been initialised
-applicationContext.setSessionTracking.ise=The session tracking modes for 
context [{0}] cannot be set whilst the context is running
 applicationContext.setSessionTracking.iae.invalid=The session tracking mode 
[{0}] requested for context [{1}] is not supported by that context
 applicationContext.setSessionTracking.iae.ssl=The session tracking modes 
requested for context [{0}] included SSL and at least one other mode. SSL may 
not be configured with other modes.
-applicationContext.lookup.error=Failed to locate resource [{0}] in context 
[{1}]
+applicationContext.setSessionTracking.ise=The session tracking modes for 
context [{0}] cannot be set whilst the context is running
+
 applicationDispatcher.allocateException=Allocate exception for servlet [{0}]
 applicationDispatcher.deallocateException=Deallocate exception for servlet 
[{0}]
 applicationDispatcher.forward.ise=Cannot forward after response has been 
committed
@@ -47,11 +48,13 @@ applicationDispatcher.isUnavailable=Serv
 applicationDispatcher.serviceException=Servlet.service() for servlet [{0}] 
threw exception
 applicationDispatcher.specViolation.request=Original ServletRequest or wrapped 
original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 
and SRV.14.2.5.1
 applicationDispatcher.specViolation.response=Original ServletResponse or 
wrapped original ServletResponse not passed to RequestDispatcher in violation 
of SRV.8.2 and SRV.14.2.5.1
+
 applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of 
type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter 
of type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for 
filter of type [{0}] and name [{1}]
 applicationFilterConfig.preDestroy=Failed the call to preDestroy for the 
filter named [{0}] of type [{1}]
 applicationFilterConfig.release=Failed to destroy the filter named [{0}] of 
type [{1}]
+
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
 
@@ -61,66 +64,79 @@ applicationPushBuilder.noCoyoteRequest=U
 
 applicationServletRegistration.setServletSecurity.iae=Null constraint 
specified for servlet [{0}] deployed to context with name [{1}]
 applicationServletRegistration.setServletSecurity.ise=Security constraints 
can''t be added to servlet [{0}] deployed to context with name [{1}] as the 
context has already been initialised
+
 applicationSessionCookieConfig.ise=Property [{0}] cannot be added to 
SessionCookieConfig for context [{1}] as the context has been initialised
+
+aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
 aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: [{0}]
 aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
 aprListener.aprInitError=The APR based Apache Tomcat Native library failed to 
load. The error reported was [{0}]
-aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version [{1}]
-aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a minimum version of [{1}]
-aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
-aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using 
APR version [{1}].
-aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
-aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}], 
useOpenSSL [{1}]
-aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
+aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
-aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
-aprListener.initializingFIPS=Initializing FIPS mode...
-aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
 aprListener.initializeFIPSFailed=Failed to enter FIPS mode
+aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
+aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
+aprListener.initializingFIPS=Initializing FIPS mode...
+aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
+aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
+aprListener.sslInit=Failed to initialize the SSLEngine.
+aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version [{1}]
+aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using 
APR version [{1}].
+aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a minimum version of [{1}]
+aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
 aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been 
initialized
 aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already 
been initialized
-aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
-aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
+aprListener.wrongFIPSMode=Unexpected value of FIPSMode option of 
AprLifecycleListener: [{0}]
 
+asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has 
already been called. Additional asynchronous dispatch operation within the same 
asynchronous cycle is not allowed.
+asyncContextImpl.noAsyncDispatcher=The dispatcher returned from the 
ServletContext does not support asynchronous dispatching
 asyncContextImpl.request.ise=It is illegal to call getRequest() after 
complete() or any of the dispatch() methods has been called
 asyncContextImpl.requestEnded=The request associated with the AsyncContext has 
already completed processing.
 asyncContextImpl.response.ise=It is illegal to call getResponse() after 
complete() or any of the dispatch() methods has been called
-asyncContextImpl.noAsyncDispatcher=The dispatcher returned from the 
ServletContext does not support asynchronous dispatching
-asyncContextImpl.dispatchingStarted=Asynchronous dispatch operation has 
already been called. Additional asynchronous dispatch operation within the same 
asynchronous cycle is not allowed.
-containerBase.nullName=Container name cannot be null
-containerBase.threadedStartFailed=A child container failed during start
-containerBase.threadedStopFailed=A child container failed during stop
+
 containerBase.backgroundProcess.cluster=Exception processing cluster [{0}] 
background process
+containerBase.backgroundProcess.error=Exception processing background thread
 containerBase.backgroundProcess.realm=Exception processing realm [{0}] 
background process
-containerBase.backgroundProcess.valve=Exception processing valve [{0}] 
background process
 containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of 
background thread [{0}]
-containerBase.backgroundProcess.error=Exception processing background thread
+containerBase.backgroundProcess.valve=Exception processing valve [{0}] 
background process
+containerBase.nullName=Container name cannot be null
+containerBase.threadedStartFailed=A child container failed during start
+containerBase.threadedStopFailed=A child container failed during stop
+
+defaultInstanceManager.invalidInjection=Invalid method resource injection 
annotation
+defaultInstanceManager.restrictedClass=Access to class [{0}] is forbidden. It 
is a restricted class. A web application must be configured as privileged to be 
able to load it
+defaultInstanceManager.restrictedContainerServlet=Access to class [{0}] is 
forbidden. It is a restricted class (implements ContainerServlet interface). A 
web application must be configured as privileged to be able to load it
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not found [{0}]
+defaultInstanceManager.restrictedListenersResource=Restricted listeners 
property file not found [{0}]
+defaultInstanceManager.restrictedServletsResource=Restricted servlets property 
file not found [{0}]
+defaultInstanceManager.restrictedWrongValue=Wrong value in restricted classes 
property file [{0}] for class name [{1}]. Expected value: [restricted], actual 
value: [{2}]
+
 filterChain.filter=Filter execution threw an exception
 filterChain.servlet=Servlet execution threw an exception
+
+jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak 
in javax.security.auth.Policy class
+jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat 
start to prevent possible memory leaks.
 jreLeakListener.gcDaemonFail=Failed to trigger creation of the GC Daemon 
thread during Tomcat start to prevent possible memory leaks. This is expected 
on non-Sun JVMs.
 jreLeakListener.jarUrlConnCacheFail=Failed to disable Jar URL connection 
caching by default
-jreLeakListener.xmlParseFail=Error whilst attempting to prevent memory leaks 
during XML parsing
-jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak 
in javax.security.auth.Policy class
 jreLeakListener.ldapPoolManagerFail=Failed to trigger creation of the 
com.sun.jndi.ldap.LdapPoolManager class during Tomcat start to prevent possible 
memory leaks. This is expected on non-Sun JVMs.
-jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat 
start to prevent possible memory leaks.
+jreLeakListener.xmlParseFail=Error whilst attempting to prevent memory leaks 
during XML parsing
 
 naming.addEnvEntry=Adding environment entry [{0}]
 naming.addResourceEnvRef=Adding resource env ref [{0}]
-naming.wsdlFailed=Failed to find wsdl file: [{0}]
 naming.bindFailed=Failed to bind object: [{0}]
-naming.jmxRegistrationFailed=Failed to register in JMX: [{0}]
-naming.unbindFailed=Failed to unbind object: [{0}]
 naming.invalidEnvEntryType=Environment entry [{0}] has an invalid type
 naming.invalidEnvEntryValue=Environment entry [{0}] has an invalid value
+naming.jmxRegistrationFailed=Failed to register in JMX: [{0}]
 naming.namingContextCreationFailed=Creation of the naming context failed: [{0}]
+naming.unbindFailed=Failed to unbind object: [{0}]
+naming.wsdlFailed=Failed to find wsdl file: [{0}]
+
 noPluggabilityServletContext.notAllowed=Section 4.4 of the Servlet 3.0 
specification does not permit this method to be called from a 
ServletContextListener that was not defined in web.xml, a web-fragment.xml file 
nor annotated with @WebListener
 
 pushBuilder.noPath=It is illegal to call push() before setting a path
 
-standardContext.invalidWrapperClass=[{0}] is not a subclass of StandardWrapper
 standardContext.applicationListener=Error configuring application listener of 
class [{0}]
 standardContext.applicationSkipped=Skipped installing application listeners 
due to previous error(s)
 standardContext.backgroundProcess.instanceManager=Exception processing 
instance manager [{0}] background process
@@ -140,7 +156,7 @@ standardContext.filterMap.either=Filter
 standardContext.filterMap.name=Filter mapping specifies an unknown filter name 
[{0}]
 standardContext.filterMap.pattern=Invalid <url-pattern> [{0}] in filter mapping
 standardContext.filterStart=Exception starting filter [{0}]
-standardContext.requestListener.requestInit=Exception sending request 
initialized lifecycle event to listener instance of class [{0}]
+standardContext.invalidWrapperClass=[{0}] is not a subclass of StandardWrapper
 standardContext.isUnavailable=This application is not currently available
 standardContext.listenerFail=One or more listeners failed to start. Full 
details will be found in the appropriate container log file
 standardContext.listenerStart=Exception sending context initialized event to 
listener instance of class [{0}]
@@ -153,8 +169,8 @@ standardContext.loginConfig.loginWarning
 standardContext.loginConfig.required=LoginConfig cannot be null
 standardContext.manager=Configured a manager of class [{0}]
 standardContext.managerFail=The session manager failed to start
-standardContext.namingResource.init.fail=Failed to init new naming resources
 standardContext.namingResource.destroy.fail=Failed to destroy old naming 
resources
+standardContext.namingResource.init.fail=Failed to init new naming resources
 standardContext.noResourceJar=Resource JARs are not supported. The JAR found 
at [{0}] will not be used to provide static content for context with name [{1}]
 standardContext.notStarted=Context with name [{0}] has not yet been started
 standardContext.notWrapper=Child of a Context must be a Wrapper
@@ -167,6 +183,7 @@ standardContext.predestroy.duplicate=Dup
 standardContext.predestroy.required=Both fully qualified class name and method 
name are required
 standardContext.reloadingCompleted=Reloading Context with name [{0}] is 
completed
 standardContext.reloadingStarted=Reloading Context with name [{0}] has started
+standardContext.requestListener.requestInit=Exception sending request 
initialized lifecycle event to listener instance of class [{0}]
 standardContext.resourcesInit=Error initializing static Resources
 standardContext.resourcesStart=Error starting static Resources
 standardContext.resourcesStop=Error stopping static Resources
@@ -183,31 +200,38 @@ standardContext.threadBindingListenerErr
 standardContext.unknownCookieEncoding=The unknown encoding [{0}] was specified 
for setCookieEncoding(String) so the default of UTF-8 will be used instead
 standardContext.urlPattern.patternWarning=WARNING: URL pattern [{0}] must 
start with a ''/'' in Servlet 2.4
 standardContext.webappClassLoader.missingProperty=Unable to set the web 
application class loader property [{0}] to [{1}] as the property does not exist.
-standardContext.workPath=Exception obtaining work path for context [{0}]
 standardContext.workCreateException=Failed to determine absolute work 
directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]
 standardContext.workCreateFail=Failed to create work directory [{0}] for 
context [{1}]
+standardContext.workPath=Exception obtaining work path for context [{0}]
+
 standardContextValve.acknowledgeException=Failed to acknowledge request with a 
100 (Continue) response
+
 standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from 
system property
 standardEngine.notHost=Child of an Engine must be a Host
 standardEngine.notParent=Engine cannot have a parent Container
+
 standardHost.clientAbort=Remote Client Aborted Request, IOException: [{0}]
 standardHost.invalidErrorReportValveClass=Couldn''t load specified error 
report valve class: [{0}]
 standardHost.noContext=No Context configured to process this request
 standardHost.notContext=Child of a Host must be a Context
 standardHost.nullName=Host name is required
 standardHost.problematicAppBase=Using an empty string for appBase on host 
[{0}] will set it to CATALINA_BASE, which is a bad idea
+
 standardHostValue.customStatusFailed=Custom error page [{0}] could not be 
dispatched correctly
+
 standardServer.accept.timeout=The socket listening for the shutdown command 
experienced an unexpected timeout [{0}] milliseconds after the call to 
accept(). Is this an instance of bug 56684?
 standardServer.awaitSocket.fail=Failed to create server shutdown socket on 
address [{0}] and port [{1}] (base port [{2}] and offset [{3}])
 standardServer.portOffset.invalid=The value [{0}] for portOffset is not valid 
as portOffset may not be negative
 standardServer.shutdownViaPort=A valid shutdown command was received via the 
shutdown port. Stopping the Server instance.
 standardServer.storeConfig.notAvailable=No StoreConfig implementation was 
registered as an MBean named [{0}] so no configuration could be saved. A 
suitable MBean is normally registered via the StoreConfigLifecycleListener.
+
 standardService.engine.startFailed=Failed to start associated Engine
 standardService.engine.stopFailed=Failed to stop associated Engine
 standardService.mapperListener.startFailed=Failed to start associated 
MapperListener
 standardService.mapperListener.stopFailed=Failed to stop associated 
MapperListener
 standardService.start.name=Starting service [{0}]
 standardService.stop.name=Stopping service [{0}]
+
 standardWrapper.allocate=Error allocating a servlet instance
 standardWrapper.allocateException=Allocate exception for servlet [{0}]
 standardWrapper.deallocateException=Deallocate exception for servlet [{0}]
@@ -228,13 +252,6 @@ standardWrapper.unavailable=Marking serv
 standardWrapper.unloadException=Servlet [{0}] threw unload() exception
 standardWrapper.unloading=Cannot allocate servlet [{0}] because it is being 
unloaded
 standardWrapper.waiting=Waiting for [{0}] instance(s) to be deallocated for 
Servlet [{1}]
-threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing 
lifecycle event [{0}]
-threadLocalLeakPreventionListener.containerEvent.error=Exception processing 
container event [{0}]
 
-defaultInstanceManager.invalidInjection=Invalid method resource injection 
annotation
-defaultInstanceManager.restrictedClass=Access to class [{0}] is forbidden. It 
is a restricted class. A web application must be configured as privileged to be 
able to load it
-defaultInstanceManager.restrictedContainerServlet=Access to class [{0}] is 
forbidden. It is a restricted class (implements ContainerServlet interface). A 
web application must be configured as privileged to be able to load it
-defaultInstanceManager.restrictedWrongValue=Wrong value in restricted classes 
property file [{0}] for class name [{1}]. Expected value: [restricted], actual 
value: [{2}]
-defaultInstanceManager.restrictedFiltersResource=Restricted filters property 
file not found [{0}]
-defaultInstanceManager.restrictedListenersResource=Restricted listeners 
property file not found [{0}]
-defaultInstanceManager.restrictedServletsResource=Restricted servlets property 
file not found [{0}]
+threadLocalLeakPreventionListener.containerEvent.error=Exception processing 
container event [{0}]
+threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing 
lifecycle event [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -15,43 +15,45 @@
 
 addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not 
supported
 
-corsFilter.invalidSupportsCredentials=It is not allowed to configure 
supportsCredentials=[true] when allowedOrigins=[*]
 corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge
+corsFilter.invalidSupportsCredentials=It is not allowed to configure 
supportsCredentials=[true] when allowedOrigins=[*]
 corsFilter.nullRequest=HttpServletRequest object is null
 corsFilter.nullRequestType=CORSRequestType object is null
 corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
 corsFilter.wrongType1=Expects a HttpServletRequest object of type [{0}]
 corsFilter.wrongType2=Expects a HttpServletRequest object of type [{0}] or 
[{1}]
-csrfPrevention.invalidRandomClass=Unable to create Random source using class 
[{0}]
-filterbase.noSuchProperty=The property [{0}] is not defined for filters of 
type [{1}]
 
-http.403=Access to the specified resource [{0}] has been forbidden.
+csrfPrevention.invalidRandomClass=Unable to create Random source using class 
[{0}]
 
-expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}] 
content-type [{2}], no expiration configured
-expiresFilter.setExpirationDate=Request [{0}] with response status [{1}] 
content-type [{2}], set expiration date [{3}]
-expiresFilter.startingPointNotFound=Starting point 
(access|now|modification|a<seconds>|m<seconds>) not found in directive [{0}]
-expiresFilter.startingPointInvalid=Invalid starting point 
(access|now|modification|a<seconds>|m<seconds>) [{0}] in directive [{1}]
-expiresFilter.responseAlreadyCommited=Request [{0}], cannot apply 
ExpiresFilter on already committed response.
-expiresFilter.noExpirationConfiguredForContentType=No Expires configuration 
found for content-type [{0}]
-expiresFilter.useMatchingConfiguration=Use [{0}] matching [{1}] for 
content-type [{2}] returns [{3}]
-expiresFilter.useDefaultConfiguration=Use default [{0}] for content-type [{1}] 
returns [{2}]
-expiresFilter.noDurationFound=Duration not found in directive [{0}]
-expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount 
[{0}] in directive [{1}]
-expiresFilter.unsupportedStartingPoint=Unsupported startingPoint [{0}]
-expiresFilter.unknownParameterIgnored=Unknown parameter [{0}] with value [{1}] 
is ignored !
 expiresFilter.exceptionProcessingParameter=Exception processing configuration 
parameter [{0}]:[{1}]
-expiresFilter.filterInitialized=Filter initialized with configuration [{0}]
 expiresFilter.expirationHeaderAlreadyDefined=Request [{0}] with response 
status [{1}] content-type [{2}], expiration header already defined
-expiresFilter.skippedStatusCode=Request [{0}] with response status [{1}] 
content-type [{1}], skip expiration header generation for given status
+expiresFilter.filterInitialized=Filter initialized with configuration [{0}]
 expiresFilter.invalidDurationNumber=Invalid duration (number) [{0}] in 
directive [{1}]
 expiresFilter.invalidDurationUnit=Invalid duration unit 
(years|months|weeks|days|hours|minutes|seconds) [{0}] in directive [{1}]
+expiresFilter.noDurationFound=Duration not found in directive [{0}]
+expiresFilter.noDurationUnitAfterAmount=Duration unit not found after amount 
[{0}] in directive [{1}]
+expiresFilter.noExpirationConfigured=Request [{0}] with response status [{1}] 
content-type [{2}], no expiration configured
+expiresFilter.noExpirationConfiguredForContentType=No Expires configuration 
found for content-type [{0}]
+expiresFilter.responseAlreadyCommited=Request [{0}], cannot apply 
ExpiresFilter on already committed response.
+expiresFilter.setExpirationDate=Request [{0}] with response status [{1}] 
content-type [{2}], set expiration date [{3}]
+expiresFilter.skippedStatusCode=Request [{0}] with response status [{1}] 
content-type [{1}], skip expiration header generation for given status
+expiresFilter.startingPointInvalid=Invalid starting point 
(access|now|modification|a<seconds>|m<seconds>) [{0}] in directive [{1}]
+expiresFilter.startingPointNotFound=Starting point 
(access|now|modification|a<seconds>|m<seconds>) not found in directive [{0}]
+expiresFilter.unknownParameterIgnored=Unknown parameter [{0}] with value [{1}] 
is ignored !
+expiresFilter.unsupportedStartingPoint=Unsupported startingPoint [{0}]
+expiresFilter.useDefaultConfiguration=Use default [{0}] for content-type [{1}] 
returns [{2}]
+expiresFilter.useMatchingConfiguration=Use [{0}] matching [{1}] for 
content-type [{2}] returns [{3}]
+
+filterbase.noSuchProperty=The property [{0}] is not defined for filters of 
type [{1}]
+
+http.403=Access to the specified resource [{0}] has been forbidden.
 
-httpHeaderSecurityFilter.committed=Unable to add HTTP headers since response 
is already committed on entry to the HTTP header security Filter
 httpHeaderSecurityFilter.clickjack.invalid=An invalid value [{0}] was 
specified for the anti click-jacking header
+httpHeaderSecurityFilter.committed=Unable to add HTTP headers since response 
is already committed on entry to the HTTP header security Filter
 
 remoteCidrFilter.invalid=Invalid configuration provided for [{0}]. See 
previous messages for details.
 remoteCidrFilter.noRemoteIp=Client does not have an IP address. Request denied.
 
 requestFilter.deny=Denied request for [{0}] based on property [{1}]
 
-restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed
\ No newline at end of file
+restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties 
[UTF-8] (original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+clusterSingleSignOn.clusterLoad.fail=ClusterSingleSignOn exception during 
clusterLoad
 clusterSingleSignOn.nocluster=There is no Cluster for ClusterSingleSignOn
-clusterSingleSignOn.clusterLoad.fail=ClusterSingleSignOn exception during 
clusterLoad
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -15,5 +15,5 @@
 
 applicationContext.setAttribute.namenull=Name cannot be null
 
+replicatedContext.startFailed=Failed to start ReplicatedContext: [{0}]
 replicatedContext.startUnable=Unable to start ReplicatedContext: [{0}]
-replicatedContext.startFailed=Failed to start ReplicatedContext: [{0}]
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,27 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-fileNewFail=Unable to create [{0}]
-
+farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
 farmWarDeployer.deleteFail=Failed to delete [{0}]
 farmWarDeployer.deployEnd=Deployment from [{0}] finished.
 farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
 farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster 
subelement!
 farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of 
[{0}] is an engine!
 farmWarDeployer.mbeanNameFail=Cannot construct MBean object name for engine 
[{0}] and host [{1}]
-farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
 farmWarDeployer.modInstall=Installing webapp [{0}] from [{1}]
-farmWarDeployer.modRemoveFail=No removal
 farmWarDeployer.modInstallFail=Unable to install WAR file
+farmWarDeployer.modRemoveFail=No removal
 farmWarDeployer.msgIoe=Unable to read farm deploy file message.
 farmWarDeployer.msgRxDeploy=Receive cluster deployment path [{0}], war [{1}]
 farmWarDeployer.msgRxUndeploy=Receive cluster undeployment from path [{0}]
-farmWarDeployer.removeStart=Cluster wide remove of web app [{0}]
-farmWarDeployer.removeTxMsg=Send cluster wide undeployment from [{0}]
-farmWarDeployer.removeFailRemote=Local remove from [{0}] failed, other manager 
has app in service!
 farmWarDeployer.removeFailLocal=Local remove from [{0}] failed
+farmWarDeployer.removeFailRemote=Local remove from [{0}] failed, other manager 
has app in service!
 farmWarDeployer.removeLocal=Removing webapp [{0}]
 farmWarDeployer.removeLocalFail=Unable to remove WAR file
+farmWarDeployer.removeStart=Cluster wide remove of web app [{0}]
+farmWarDeployer.removeTxMsg=Send cluster wide undeployment from [{0}]
 farmWarDeployer.renameFail=Failed to rename [{0}] to [{1}]
 farmWarDeployer.sendEnd=Send cluster war deployment path [{0}], war [{1}] 
finished.
 farmWarDeployer.sendFragment=Send cluster war fragment path [{0}], war [{1}] 
to [{2}]
@@ -48,8 +46,10 @@ farmWarDeployer.watchDir=Cluster deploym
 
 fileMessageFactory.deleteFail=Failed to delete [{0}]
 
+fileNewFail=Unable to create [{0}]
+
+warWatcher.cantListWatchDir=Cannot list files in WatchDir [{0}]: check to see 
if it is a directory and has read permissions.
+warWatcher.checkWarResult=WarInfo.check() returned [{0}] for [{1}]
+warWatcher.checkingWar=Checking WAR file [{0}]
 warWatcher.checkingWars=Checking WARs in [{0}]
 warWatcher.listedFileDoesNotExist=[{0}] was detected in [{1}] but does not 
exist. Check directory permissions on [{1}]?
-warWatcher.checkingWar=Checking WAR file [{0}]
-warWatcher.checkWarResult=WarInfo.check() returned [{0}] for [{1}]
-warWatcher.cantListWatchDir=Cannot list files in WatchDir [{0}]: check to see 
if it is a directory and has read permissions.

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -13,7 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-deltaManager.createSession.newSession=Created a DeltaSession with Id [{0}] 
Total count=[{1}]
+backupManager.noCluster=no cluster associated with this context: [{0}]
+backupManager.startFailed=Failed to start BackupManager: [{0}]
+backupManager.startUnable=Unable to start BackupManager: [{0}]
+backupManager.stopped=Manager [{0}] is stopping
+
+clusterSessionListener.noManager=Context manager doesn''t exist:[{0}]
+
 deltaManager.createMessage.access=Manager [{0}]: create session message [{1}] 
access.
 deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create session 
message [{1}] access to change primary.
 deltaManager.createMessage.allSessionData=Manager [{0}] send all session data.
@@ -21,48 +27,52 @@ deltaManager.createMessage.allSessionTra
 deltaManager.createMessage.delta=Manager [{0}]: create session message [{1}] 
delta request.
 deltaManager.createMessage.expire=Manager [{0}]: create session message [{1}] 
expire.
 deltaManager.createMessage.unableCreateDeltaRequest=Unable to serialize delta 
request for sessionid [{0}]
+deltaManager.createSession.newSession=Created a DeltaSession with Id [{0}] 
Total count=[{1}]
 deltaManager.dropMessage=Manager [{0}]: Drop message [{1}] inside 
GET_ALL_SESSIONS sync phase start date [{2}] message date [{3}]
+deltaManager.expireSessions=Manager [{0}] expiring sessions upon shutdown
 deltaManager.foundMasterMember=Found for context [{0}] the replication master 
member [{1}]
 deltaManager.loading.cnfe=ClassNotFoundException while loading persisted 
sessions: [{0}]
 deltaManager.loading.existing.session=overload existing session [{0}]
 deltaManager.loading.ioe=IOException while loading persisted sessions: [{0}]
 deltaManager.managerLoad=Exception loading sessions from persistent storage
 deltaManager.noCluster=Starting... no cluster associated with this context: 
[{0}]
+deltaManager.noContextManager=Manager [{0}]: No context manager send at [{1}] 
received in [{2}] ms.
 deltaManager.noMasterMember=Starting... with no other member for context [{0}] 
at domain [{1}]
 deltaManager.noMembers=Manager [{0}]: skipping state transfer. No members 
active in cluster group.
 deltaManager.noSessionState=Manager [{0}]: No session state send at [{1}] 
received, timing out after [{2}] ms.
-deltaManager.noContextManager=Manager [{0}]: No context manager send at [{1}] 
received in [{2}] ms.
-deltaManager.sendMessage.newSession=Manager [{0}] send new session [{1}]
-deltaManager.expireSessions=Manager [{0}] expiring sessions upon shutdown
 deltaManager.receiveMessage.accessed=Manager [{0}]: received session [{1}] 
accessed.
+deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session state 
deserialized
+deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received 
session state data
 deltaManager.receiveMessage.createNewSession=Manager [{0}]: received session 
[{1}] created.
 deltaManager.receiveMessage.delta=Manager [{0}]: received session [{1}] delta.
 deltaManager.receiveMessage.delta.unknown=Manager [{0}]: received unknown 
session [{1}] delta.
 deltaManager.receiveMessage.error=Manager [{0}]: Unable to receive message 
through TCP channel
 deltaManager.receiveMessage.eventType=Manager [{0}]: Received SessionMessage 
of type=[{1}] from [{2}]
 deltaManager.receiveMessage.expired=Manager [{0}]: received session [{1}] 
expired.
-deltaManager.receiveMessage.transfercomplete=Manager [{0}] received from node 
[{1}:{2}] session state transfered.
 deltaManager.receiveMessage.noContextManager=Manager [{0}] received from node 
[{1}:{2}] no context manager.
+deltaManager.receiveMessage.transfercomplete=Manager [{0}] received from node 
[{1}:{2}] session state transfered.
 deltaManager.receiveMessage.unloadingAfter=Manager [{0}]: unloading sessions 
complete
 deltaManager.receiveMessage.unloadingBegin=Manager [{0}]: start unloading 
sessions
-deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session state 
deserialized
-deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received 
session state data
 deltaManager.registerCluster=Register manager [{0}] to cluster element [{1}] 
with name [{2}]
+deltaManager.sendMessage.newSession=Manager [{0}] send new session [{1}]
 deltaManager.sessionReceived=Manager [{0}]; session state send at [{1}] 
received in [{2}] ms.
 deltaManager.startClustering=Starting clustering manager at [{0}]
 deltaManager.stopped=Manager [{0}] is stopping
+deltaManager.unableSerializeSessionID=Unable to serialize sessionID [{0}]
 deltaManager.unloading.ioe=IOException while saving persisted sessions: [{0}]
 deltaManager.waitForSessionState=Manager [{0}], requesting session state from 
[{1}]. This operation will timeout if no session state has been received within 
[{2}] seconds.
-deltaManager.unableSerializeSessionID =Unable to serialize sessionID [{0}]
-deltaRequest.showPrincipal=Principal [{0}] is set to session [{1}]
-deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
+
+deltaRequest.invalidAttributeInfoType=Invalid attribute info type=[{0}]
 deltaRequest.removeUnable=Unable to remove element:
+deltaRequest.showPrincipal=Principal [{0}] is set to session [{1}]
 deltaRequest.ssid.mismatch=Session id mismatch, not executing the delta request
-deltaRequest.invalidAttributeInfoType=Invalid attribute info type=[{0}]
 deltaRequest.ssid.null=Session Id is null for setSessionId
+deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. 
Your realm used principal class [{0}].
+
 deltaSession.notifying=Notifying cluster of expiration primary=[{0}] sessionId 
[{1}]
 deltaSession.readSession=readObject() loading session [{0}]
 deltaSession.writeSession=writeObject() storing session [{0}]
+
 jvmRoute.cannotFindSession=Cannot find session [{0}]
 jvmRoute.changeSession=Changed session from [{0}] to [{1}]
 jvmRoute.failover=Detected a failover with different jvmRoute - orginal route: 
[{0}] new one: [{1}] at session id [{2}]
@@ -70,15 +80,11 @@ jvmRoute.foundManager=Found Cluster Mana
 jvmRoute.missingJvmRouteAttribute=No engine jvmRoute attribute configured!
 jvmRoute.noCluster=The JvmRouterBinderValve is configured, but clustering is 
not being used. Fail over will still work, providing a PersistentManager is 
used.
 jvmRoute.notFoundManager=Not found Cluster Manager at [{0}]
+jvmRoute.set.orignalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
 jvmRoute.turnoverInfo=Turnover Check time [{0}] msec
 jvmRoute.valve.started=JvmRouteBinderValve started
 jvmRoute.valve.stopped=JvmRouteBinderValve stopped
-jvmRoute.set.orignalsessionid=Set Orginal Session id at request attribute 
[{0}] value: [{1}]
+
 standardSession.notSerializable=Cannot serialize session attribute [{0}] for 
session [{1}]
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
-backupManager.noCluster=no cluster associated with this context: [{0}]
-backupManager.startUnable=Unable to start BackupManager: [{0}]
-backupManager.startFailed=Failed to start BackupManager: [{0}]
-backupManager.stopped=Manager [{0}] is stopping
-clusterSessionListener.noManager=Context manager doesn''t exist:[{0}]

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -17,8 +17,8 @@ ReplicationValve.crossContext.add=add Cr
 ReplicationValve.crossContext.registerSession=register Cross context session 
id=[{0}] from context [{1}]
 ReplicationValve.crossContext.remove=remove Cross Context session replication 
container from replicationValve threadlocal
 ReplicationValve.crossContext.sendDelta=send Cross Context session delta from 
context [{0}].
-ReplicationValve.filter.loading=Loading request filter=[{0}]
 ReplicationValve.filter.failure=Unable to compile filter=[{0}]
+ReplicationValve.filter.loading=Loading request filter=[{0}]
 ReplicationValve.invoke.uri=Invoking replication request on [{0}]
 ReplicationValve.nocluster=No cluster configured for this request.
 ReplicationValve.resetDeltaRequest=Cluster is standalone: reset Session 
Request Delta at context [{0}]
@@ -28,14 +28,15 @@ ReplicationValve.session.found=Context [
 ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{0}] 
in request attribute [{1}] is [{2}].
 ReplicationValve.session.invalid=Context [{0}]: Requested session [{1}] is 
invalid, removed or not replicated at this node.
 ReplicationValve.stats=Average request time= [{0}] ms for Cluster overhead 
time=[{1}] ms for [{2}] requests [{3}] filter requests [{4}] send requests 
[{5}] cross context requests (Request=[{6}] ms Cluster=[{7}] ms).
+
 simpleTcpCluster.clustermanager.cloneFailed=Unable to clone cluster manager, 
defaulting to org.apache.catalina.ha.session.DeltaManager
 simpleTcpCluster.clustermanager.notImplement=Manager [{0}] does not implement 
ClusterManager, addition to cluster has been aborted.
+simpleTcpCluster.member.addFailed=Unable to connect to replication system.
+simpleTcpCluster.member.added=Replication member added:[{0}]
+simpleTcpCluster.member.disappeared=Received member disappeared:[{0}]
+simpleTcpCluster.member.removeFailed=Unable remove cluster node from 
replication system.
+simpleTcpCluster.sendFailed=Unable to send message through cluster sender.
 simpleTcpCluster.start=Cluster is about to start
 simpleTcpCluster.startUnable=Unable to start cluster.
 simpleTcpCluster.stopUnable=Unable to stop cluster.
 simpleTcpCluster.unableSend.localMember=Unable to send message to local member 
[{0}]
-simpleTcpCluster.sendFailed=Unable to send message through cluster sender.
-simpleTcpCluster.member.added=Replication member added:[{0}]
-simpleTcpCluster.member.addFailed=Unable to connect to replication system.
-simpleTcpCluster.member.disappeared=Received member disappeared:[{0}]
-simpleTcpCluster.member.removeFailed=Unable remove cluster node from 
replication system.

Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -17,55 +17,55 @@ webappClassLoader.addExportsRmi=When run
 webappClassLoader.addExportsThreadLocal=When running on Java 9 you need to add 
"--add-opens=java.base/java.lang=ALL-UNNAMED" to the JVM command line arguments 
to enable ThreadLocal memory leak detection. Alternatively, you can suppress 
this warning by disabling ThreadLocal memory leak detection.
 webappClassLoader.addPermisionNoCanonicalFile=Unable to obtain a canonical 
file path from the URL [{0}]
 webappClassLoader.addPermisionNoProtocol=The protocol [{0}] in the URL [{1}] 
is not supported so no read permission was granted for resources located at 
this URL
-webappClassLoader.illegalJarPath=Illegal JAR entry detected with name [{0}]
-webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web 
application [{0}]
-webappClassLoader.stopped=Illegal access: this web application instance has 
been stopped already. Could not load [{0}]. The following stack trace is thrown 
for debugging purposes as well as to attempt to terminate the thread which 
caused the illegal access.
-webappClassLoader.readError=Resource read error: Could not load [{0}].
-webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC 
driver [{1}] but failed to unregister it when the web application was stopped. 
To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
-webappClassLoader.clearObjectStreamClassCachesFail=Failed to clear soft 
references from ObjectStreamClass$Caches for web application [{0}]
-webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}] 
ResourceBundle references from the cache for web application [{1}]
-webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear 
ResourceBundle references for web application [{0}]
-webappClassLoader.clearRmi=Found RMI Target with stub class class [{0}] and 
value [{1}]. This RMI Target has been forcibly removed to prevent a memory leak.
-webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target 
to clear context class loader for web application [{0}]. This is expected on 
non-Sun JVMs.
-webappClassLoader.clearRmiFail=Failed to clear context class loader referenced 
from sun.rmi.transport.Target for web application [{0}]
+webappClassLoader.addTransformer=Added class file transformer [{0}] to web 
application [{1}].
+webappClassLoader.addTransformer.duplicate=Duplicate call to add class file 
transformer [{0}] to web application [{1}] ignored.
+webappClassLoader.addTransformer.illegalArgument=The web application [{0}] 
attempted to add a null class file transformer.
+webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created 
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}] 
(value [{4}]) but failed to remove it when the web application was stopped. 
Threads are going to be renewed over time to try and avoid a probable memory 
leak.
 webappClassLoader.checkThreadLocalsForLeaks.badKey=Unable to determine string 
representation of key of type [{0}]
 webappClassLoader.checkThreadLocalsForLeaks.badValue=Unable to determine 
string representation of value of type [{0}]
 webappClassLoader.checkThreadLocalsForLeaks.unknown=Unknown
-webappClassLoader.checkThreadLocalsForLeaks=The web application [{0}] created 
a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type [{3}] 
(value [{4}]) but failed to remove it when the web application was stopped. 
Threads are going to be renewed over time to try and avoid a probable memory 
leak.
+webappClassLoader.checkThreadLocalsForLeaksFail=Failed to check for 
ThreadLocal references for web application [{0}]
 webappClassLoader.checkThreadLocalsForLeaksNone=The web application [{0}] 
created a ThreadLocal with key of type [{1}] (value [{2}]) and a value of type 
[{3}] (value [{4}]). Since keys are only weakly held by the ThreadLocal Map 
this is not a memory leak.
 webappClassLoader.checkThreadLocalsForLeaksNull=The web application [{0}] 
created a ThreadLocal with key of type [{1}] (value [{2}]). The ThreadLocal has 
been correctly set to null and the key will be removed by GC.
-webappClassLoader.checkThreadLocalsForLeaksFail=Failed to check for 
ThreadLocal references for web application [{0}]
 webappClassLoader.checkThreadsHttpClient=Found HttpClient keep-alive thread 
using web application class loader. Fixed by switching thread to the parent 
class loader.
+webappClassLoader.clearJdbc=The web application [{0}] registered the JDBC 
driver [{1}] but failed to unregister it when the web application was stopped. 
To prevent a memory leak, the JDBC Driver has been forcibly unregistered.
+webappClassLoader.clearObjectStreamClassCachesFail=Failed to clear soft 
references from ObjectStreamClass$Caches for web application [{0}]
+webappClassLoader.clearReferencesResourceBundlesCount=Removed [{0}] 
ResourceBundle references from the cache for web application [{1}]
+webappClassLoader.clearReferencesResourceBundlesFail=Failed to clear 
ResourceBundle references for web application [{0}]
+webappClassLoader.clearRmi=Found RMI Target with stub class class [{0}] and 
value [{1}]. This RMI Target has been forcibly removed to prevent a memory leak.
+webappClassLoader.clearRmiFail=Failed to clear context class loader referenced 
from sun.rmi.transport.Target for web application [{0}]
+webappClassLoader.clearRmiInfo=Failed to find class sun.rmi.transport.Target 
to clear context class loader for web application [{0}]. This is expected on 
non-Sun JVMs.
 webappClassLoader.getThreadGroupError=Unable to obtain the parent for 
ThreadGroup [{0}]. It will not be possible to check all threads for potential 
memory leaks
-webappClassLoader.loadedByThisOrChildFail=Failed to fully check the entries in 
an instance of [{0}] for potential memory leaks in context [{1}]
+webappClassLoader.illegalJarPath=Illegal JAR entry detected with name [{0}]
 webappClassLoader.jarsAdded=One or more JARs have been added to the web 
application [{0}]
 webappClassLoader.jarsModified=One or more JARs have been modified in the web 
application [{0}]
 webappClassLoader.jarsRemoved=One or more JARs have been removed from the web 
application [{0}]
 webappClassLoader.javaseClassLoaderNull=The j2seClassLoader attribute may not 
be null
+webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web 
application [{0}]
+webappClassLoader.loadedByThisOrChildFail=Failed to fully check the entries in 
an instance of [{0}] for potential memory leaks in context [{1}]
+webappClassLoader.readError=Resource read error: Could not load [{0}].
+webappClassLoader.removeTransformer=Removed class file transformer [{0}] from 
web application [{1}].
 webappClassLoader.resourceModified=Resource [{0}] has been modified. The last 
modified time was [{1}] and is now [{2}]
 webappClassLoader.stackTrace=The web application [{0}] appears to have started 
a thread named [{1}] but has failed to stop it. This is very likely to create a 
memory leak. Stack trace of thread:{2}
 webappClassLoader.stackTraceRequestThread=The web application [{0}] is still 
processing a request that has yet to finish. This is very likely to create a 
memory leak. You can control the time allowed for requests to finish by using 
the unloadDelay attribute of the standard Context implementation. Stack trace 
of request processing thread:[{2}]
 webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}] for 
web application [{1}]
 webappClassLoader.stopTimerThreadFail=Failed to terminate TimerThread named 
[{0}] for web application [{1}]
+webappClassLoader.stopped=Illegal access: this web application instance has 
been stopped already. Could not load [{0}]. The following stack trace is thrown 
for debugging purposes as well as to attempt to terminate the thread which 
caused the illegal access.
 webappClassLoader.superCloseFail=Failure calling close() on super class
+webappClassLoader.transformError=Instrumentation error: could not transform 
class [{0}] because its class file format is not legal.
 webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with 
name [{0}]
 webappClassLoader.warnTimerThread=The web application [{0}] appears to have 
started a TimerThread named [{1}] via the java.util.Timer API but has failed to 
stop it. To prevent a memory leak, the timer (and hence the associated thread) 
has been forcibly canceled.
 webappClassLoader.wrongVersion=(unable to load class [{0}])
-webappClassLoader.addTransformer.illegalArgument=The web application [{0}] 
attempted to add a null class file transformer.
-webappClassLoader.addTransformer.duplicate=Duplicate call to add class file 
transformer [{0}] to web application [{1}] ignored.
-webappClassLoader.addTransformer=Added class file transformer [{0}] to web 
application [{1}].
-webappClassLoader.removeTransformer=Removed class file transformer [{0}] from 
web application [{1}].
-webappClassLoader.transformError=Instrumentation error: could not transform 
class [{0}] because its class file format is not legal.
 
 webappClassLoaderParallel.registrationFailed=Registration of 
org.apache.catalina.loader.ParallelWebappClassLoader as capable of loading 
classes in parallel failed
 
+webappLoader.classDeploy=Deploy class files [{0}] to [{1}]
+webappLoader.copyFailure=Failed to copy resources
 webappLoader.deploy=Deploying class repositories to work directory [{0}]
 webappLoader.jarDeploy=Deploy JAR [{0}] to [{1}]
-webappLoader.classDeploy=Deploy class files [{0}] to [{1}]
+webappLoader.mkdirFailure=Failed to create destination directory to copy 
resources
+webappLoader.readFailure=Unable to read resource [{0}]
 webappLoader.reloadable=Cannot set reloadable property to [{0}]
 webappLoader.setContext.ise=Setting the Context is not permitted while the 
loader is started.
 webappLoader.starting=Starting this Loader
 webappLoader.stopping=Stopping this Loader
-webappLoader.copyFailure=Failed to copy resources
-webappLoader.mkdirFailure=Failed to create destination directory to copy 
resources
-webappLoader.readFailure=Unable to read resource [{0}]

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1846398&r1=1846397&r2=1846398&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties 
[UTF-8] Mon Nov 12 11:16:39 2018
@@ -14,28 +14,40 @@
 # limitations under the License.
 
 htmlManagerServlet.appsAvailable=Running
+htmlManagerServlet.appsExpire=Expire sessions
 htmlManagerServlet.appsName=Display Name
 htmlManagerServlet.appsPath=Path
 htmlManagerServlet.appsReload=Reload
-htmlManagerServlet.appsUndeploy=Undeploy
-htmlManagerServlet.appsVersion=Version
-htmlManagerServlet.appsExpire=Expire sessions
 htmlManagerServlet.appsSessions=Sessions
 htmlManagerServlet.appsStart=Start
 htmlManagerServlet.appsStop=Stop
 htmlManagerServlet.appsTasks=Commands
 htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.noVersion=None specified
-htmlManagerServlet.expire.explain=with idle &ge;
-htmlManagerServlet.expire.unit=minutes
-htmlManagerServlet.helpHtmlManager=HTML Manager Help
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Manager Help
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
-htmlManagerServlet.configTitle=Configuration
-htmlManagerServlet.configSslReloadTitle=Re-read TLS configuration files
-htmlManagerServlet.configSslHostName=TLS host name (optional)
+htmlManagerServlet.appsUndeploy=Undeploy
+htmlManagerServlet.appsVersion=Version
 htmlManagerServlet.configReloadButton=Re-read
+htmlManagerServlet.configSslHostName=TLS host name (optional)
+htmlManagerServlet.configSslReloadTitle=Re-read TLS configuration files
+htmlManagerServlet.configTitle=Configuration
+htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
+htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
+htmlManagerServlet.connectorStateBytesSent=Bytes sent:
+htmlManagerServlet.connectorStateErrorCount=Error count:
+htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service 
F: Finishing R: Ready K: Keepalive
+htmlManagerServlet.connectorStateMaxProcessingTime=Max processing time:
+htmlManagerServlet.connectorStateMaxThreads=Max threads:
+htmlManagerServlet.connectorStateProcessingTime=Processing time:
+htmlManagerServlet.connectorStateRequestCount=Request count:
+htmlManagerServlet.connectorStateTableTitleBRecv=B Recv
+htmlManagerServlet.connectorStateTableTitleBSent=B Sent
+htmlManagerServlet.connectorStateTableTitleClientAct=Client (Actual)
+htmlManagerServlet.connectorStateTableTitleClientForw=Client (Forwarded)
+htmlManagerServlet.connectorStateTableTitleRequest=Request
+htmlManagerServlet.connectorStateTableTitleStage=Stage
+htmlManagerServlet.connectorStateTableTitleTime=Time
+htmlManagerServlet.connectorStateTableTitleVHost=VHost
+htmlManagerServlet.connectorStateThreadBusy=Current thread busy:
+htmlManagerServlet.connectorStateThreadCount=Current thread count:
 htmlManagerServlet.deployButton=Deploy
 htmlManagerServlet.deployConfig=XML Configuration file path:
 htmlManagerServlet.deployPath=Context Path:
@@ -45,8 +57,8 @@ htmlManagerServlet.deployUpload=WAR file
 htmlManagerServlet.deployUploadFail=FAIL - Deploy Upload Failed, Exception: 
[{0}]
 htmlManagerServlet.deployUploadFile=Select WAR file to upload
 htmlManagerServlet.deployUploadInServerXml=FAIL - War file [{0}] cannot be 
uploaded if context is defined in server.xml
-htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded [{0}] must be a .war
 htmlManagerServlet.deployUploadNoFile=FAIL - File upload failed, no file
+htmlManagerServlet.deployUploadNotWar=FAIL - File uploaded [{0}] must be a .war
 htmlManagerServlet.deployUploadWarExists=FAIL - War file [{0}] already exists 
on server
 htmlManagerServlet.deployVersion=Version (for parallel deployment):
 htmlManagerServlet.deployWar=WAR or Directory path:
@@ -54,22 +66,44 @@ htmlManagerServlet.diagnosticsLeak=Check
 htmlManagerServlet.diagnosticsLeakButton=Find leaks
 htmlManagerServlet.diagnosticsLeakWarning=This diagnostic check will trigger a 
full garbage collection. Use it with extreme caution on production systems.
 htmlManagerServlet.diagnosticsSsl=TLS connector configuration diagnostics
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=Ciphers
-htmlManagerServlet.diagnosticsSslConnectorCipherText=List the configured TLS 
virtual hosts and the ciphers for each.
 htmlManagerServlet.diagnosticsSslConnectorCertsButton=Certificates
 htmlManagerServlet.diagnosticsSslConnectorCertsText=List the configured TLS 
virtual hosts and the certificate chain for each.
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=Ciphers
+htmlManagerServlet.diagnosticsSslConnectorCipherText=List the configured TLS 
virtual hosts and the ciphers for each.
 htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Trusted 
Certificates
 htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=List the configured 
TLS virtual hosts and the trusted certificates for each.
 htmlManagerServlet.diagnosticsTitle=Diagnostics
-htmlManagerServlet.findleaksList=\
-  The following web applications were stopped (reloaded, undeployed), but 
their\n\
-  classes from previous runs are still loaded in memory, thus causing a 
memory\n\
-  leak (use a profiler to confirm):\n
+htmlManagerServlet.expire.explain=with idle &ge;
+htmlManagerServlet.expire.unit=minutes
+htmlManagerServlet.findleaksList=The following web applications were stopped 
(reloaded, undeployed), but their\n\
+classes from previous runs are still loaded in memory, thus causing a memory\n\
+leak (use a profiler to confirm):\n
 htmlManagerServlet.findleaksNone=No web applications appear to have triggered 
a memory leak on stop, reload or undeploy.
+htmlManagerServlet.helpHtmlManager=HTML Manager Help
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
+htmlManagerServlet.helpManager=Manager Help
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
+htmlManagerServlet.jvmFreeMemory=Free Memory:
+htmlManagerServlet.jvmMaxMemory=Max Memory:
+htmlManagerServlet.jvmTableTitleInitial=Initial
+htmlManagerServlet.jvmTableTitleMaximum=Maximum
+htmlManagerServlet.jvmTableTitleMemoryPool=Memory Pool
+htmlManagerServlet.jvmTableTitleTotal=Total
+htmlManagerServlet.jvmTableTitleType=Type
+htmlManagerServlet.jvmTableTitleUsed=Used
+htmlManagerServlet.jvmTotalMemory=Total Memory:
 htmlManagerServlet.list=List Applications
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Message:
 htmlManagerServlet.noManager=-
+htmlManagerServlet.noVersion=None specified
+htmlManagerServlet.osAvailableMemory=Available memory:
+htmlManagerServlet.osFreePageFile=Free page file:
+htmlManagerServlet.osKernelTime=Process kernel time:
+htmlManagerServlet.osMemoryLoad=Memory load:
+htmlManagerServlet.osPhysicalMemory=Physical memory:
+htmlManagerServlet.osTotalPageFile=Total page file:
+htmlManagerServlet.osUserTime=Process user time:
 htmlManagerServlet.serverHostname=Hostname
 htmlManagerServlet.serverIPAddress=IP Address
 htmlManagerServlet.serverJVMVendor=JVM Vendor
@@ -80,11 +114,12 @@ htmlManagerServlet.serverOSVersion=OS Ve
 htmlManagerServlet.serverTitle=Server Information
 htmlManagerServlet.serverVersion=Tomcat Version
 htmlManagerServlet.title=Tomcat Web Application Manager
+
 managerServlet.alreadyContext=FAIL - Application already exists at path [{0}]
 managerServlet.certsNotAvailable=Certificate information cannot be obtained 
from this connector at runtime
 managerServlet.deleteFail=FAIL - Unable to delete [{0}]. The continued 
presence of this file may cause problems.
-managerServlet.deployed=OK - Deployed application at context path [{0}]
 managerServlet.deployFailed=FAIL - Failed to deploy application at context 
path [{0}]
+managerServlet.deployed=OK - Deployed application at context path [{0}]
 managerServlet.deployedButNotStarted=FAIL - Deployed application at context 
path [{0}] but context failed to start
 managerServlet.exception=FAIL - Encountered exception [{0}]
 managerServlet.findleaksFail=FAIL - Find leaks failed: Host not instance of 
StandardHost
@@ -114,18 +149,18 @@ managerServlet.saveFail=FAIL - Configura
 managerServlet.saved=OK - Server configuration saved
 managerServlet.savedContext=OK - Context [{0}] configuration saved
 managerServlet.sessiondefaultmax=Default maximum session inactive interval 
[{0}] minutes
+managerServlet.sessions=OK - Session information for application at context 
path [{0}]
 managerServlet.sessiontimeout=[{0}] minutes: [{1}] sessions
-managerServlet.sessiontimeout.unlimited=unlimited time: [{0}] sessions
 managerServlet.sessiontimeout.expired=[{0}] minutes: [{1}] sessions were 
expired
-managerServlet.sessions=OK - Session information for application at context 
path [{0}]
-managerServlet.sslConnectorCiphers=OK - Connector / SSL Cipher information
+managerServlet.sessiontimeout.unlimited=unlimited time: [{0}] sessions
 managerServlet.sslConnectorCerts=OK - Connector / Certificate Chain information
+managerServlet.sslConnectorCiphers=OK - Connector / SSL Cipher information
 managerServlet.sslConnectorTrustedCerts=OK - Connector / Trusted Certificate 
information
 managerServlet.sslReload=OK - Reloaded TLS configuration for [{0}]
 managerServlet.sslReloadAll=OK - Reloaded TLS configuration for all TLS 
virtual hosts
 managerServlet.sslReloadFail=FAIL - Failed to reload TLS configuration
-managerServlet.started=OK - Started application at context path [{0}]
 managerServlet.startFailed=FAIL - Application at context path [{0}] could not 
be started
+managerServlet.started=OK - Started application at context path [{0}]
 managerServlet.stopped=OK - Stopped application at context path [{0}]
 managerServlet.storeConfig.invalidMBean=FAIL - Unable to find the StoreConfig 
Mbean. [{0}] is not a valid name for an MBean.
 managerServlet.storeConfig.noMBean=FAIL - No StoreConfig MBean registered at 
[{0}]. Registration is typically performed by the StoreConfigLifecycleListener.
@@ -134,40 +169,6 @@ managerServlet.trustedCertsNotConfigured
 managerServlet.undeployed=OK - Undeployed application at context path [{0}]
 managerServlet.unknownCommand=FAIL - Unknown command [{0}]
 managerServlet.vminfo=OK - VM info
-statusServlet.title=Server Status
+
 statusServlet.complete=Complete Server Status
-htmlManagerServlet.osPhysicalMemory=Physical memory:
-htmlManagerServlet.osAvailableMemory=Available memory:
-htmlManagerServlet.osTotalPageFile=Total page file:
-htmlManagerServlet.osFreePageFile=Free page file:
-htmlManagerServlet.osMemoryLoad=Memory load:
-htmlManagerServlet.osKernelTime=Process kernel time:
-htmlManagerServlet.osUserTime=Process user time:
-htmlManagerServlet.jvmFreeMemory=Free Memory:
-htmlManagerServlet.jvmMaxMemory=Max Memory:
-htmlManagerServlet.jvmTotalMemory=Total Memory:
-htmlManagerServlet.jvmTableTitleMemoryPool=Memory Pool
-htmlManagerServlet.jvmTableTitleType=Type
-htmlManagerServlet.jvmTableTitleInitial=Initial
-htmlManagerServlet.jvmTableTitleTotal=Total
-htmlManagerServlet.jvmTableTitleMaximum=Maximum
-htmlManagerServlet.jvmTableTitleUsed=Used
-htmlManagerServlet.connectorStateMaxThreads=Max threads:
-htmlManagerServlet.connectorStateThreadCount=Current thread count:
-htmlManagerServlet.connectorStateThreadBusy=Current thread busy:
-htmlManagerServlet.connectorStateAliveSocketCount=Keep alive sockets count:
-htmlManagerServlet.connectorStateMaxProcessingTime=Max processing time:
-htmlManagerServlet.connectorStateProcessingTime=Processing time:
-htmlManagerServlet.connectorStateRequestCount=Request count:
-htmlManagerServlet.connectorStateErrorCount=Error count:
-htmlManagerServlet.connectorStateBytesRecieved=Bytes received:
-htmlManagerServlet.connectorStateBytesSent=Bytes sent:
-htmlManagerServlet.connectorStateTableTitleStage=Stage
-htmlManagerServlet.connectorStateTableTitleTime=Time
-htmlManagerServlet.connectorStateTableTitleBSent=B Sent
-htmlManagerServlet.connectorStateTableTitleBRecv=B Recv
-htmlManagerServlet.connectorStateTableTitleClientForw=Client (Forwarded)
-htmlManagerServlet.connectorStateTableTitleClientAct=Client (Actual)
-htmlManagerServlet.connectorStateTableTitleVHost=VHost
-htmlManagerServlet.connectorStateTableTitleRequest=Request
-htmlManagerServlet.connectorStateHint=P: Parse and prepare request S: Service 
F: Finishing R: Ready K: Keepalive
+statusServlet.title=Server Status



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