diff --git a/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties b/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
index 7a3b0ece4a37..ac41dd224856 100644
--- a/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
+++ b/java/org/apache/catalina/authenticator/jaspic/LocalStrings.properties
@@ -16,7 +16,7 @@
 authConfigFactoryImpl.load=Loading persistent provider registrations from [{0}]
 authConfigFactoryImpl.nullContext=The provided context object must not be null
 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.registerInstance=Registering instance of type [{0}] for layer [{1}] and application context [{2}]
 authConfigFactoryImpl.unsupportedContextType=This implementation only supports contexts of type jakarta.servlet.ServletContext but the provided context was of type [{0}]
 authConfigFactoryImpl.zeroLengthAppContext=A zero length application context name is not valid
 authConfigFactoryImpl.zeroLengthMessageLayer=A zero length message layer name is not valid
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index aff818f74297..4ae47e2adb97 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -51,7 +51,7 @@ 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.deletePartFailed=Failed to deleted temporary file used for part [{0}]
+coyoteRequest.deletePartFailed=Failed to delete temporary file used for part [{0}]
 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
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index a86586e7374e..7675de431885 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -42,7 +42,7 @@ applicationContext.setSessionTracking.iae.ssl=The session tracking modes request
 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.customResponse=The response class [{0}] could not be unwraped to the Catalina response class and will be closed immediately after the forward
+applicationDispatcher.customResponse=The response class [{0}] could not be unwrapped to the Catalina response class and will be closed immediately after the forward
 applicationDispatcher.deallocateException=Deallocate exception for servlet [{0}]
 applicationDispatcher.forward.ise=Cannot forward after response has been committed
 applicationDispatcher.isUnavailable=Servlet [{0}] is currently unavailable
diff --git a/java/org/apache/catalina/ha/deploy/LocalStrings.properties b/java/org/apache/catalina/ha/deploy/LocalStrings.properties
index af70f8081f92..c6c47c46a087 100644
--- a/java/org/apache/catalina/ha/deploy/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/deploy/LocalStrings.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-farmWarDeployer.alreadyDeployed=webapp [{0}] are already deployed.
+farmWarDeployer.alreadyDeployed=webapp [{0}] is already deployed.
 farmWarDeployer.delete=Deleted [{0}] before the full file was received as the maxValidTime of [{1}] seconds has expired
 farmWarDeployer.deleteFail=Failed to delete [{0}]
 farmWarDeployer.deployEnd=Deployment from [{0}] finished.
diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties b/java/org/apache/catalina/ha/session/LocalStrings.properties
index c01fd27f79fa..0fbc72cf4a66 100644
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -70,7 +70,7 @@ 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.ssid.null=Session Id is null for setSessionId
-deltaRequest.wrongPrincipalClass=ClusterManager only support GenericPrincipal. Your realm used principal class [{0}].
+deltaRequest.wrongPrincipalClass=ClusterManager only supports GenericPrincipal. Your realm used principal class [{0}].
 
 deltaSession.notifying=Notifying cluster of session expiration: manager [{0}], primary [{1}], sessionId [{2}]
 deltaSession.readSession=readObject() loading session [{0}]
diff --git a/java/org/apache/catalina/ha/tcp/LocalStrings.properties b/java/org/apache/catalina/ha/tcp/LocalStrings.properties
index e8525482bb00..b524bbe5f5ce 100644
--- a/java/org/apache/catalina/ha/tcp/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/tcp/LocalStrings.properties
@@ -25,7 +25,7 @@ ReplicationValve.resetDeltaRequest=Cluster is standalone: reset Session Request
 ReplicationValve.send.failure=Unable to perform replication request.
 ReplicationValve.send.invalid.failure=Unable to send session [id={0}] invalid message over cluster.
 ReplicationValve.session.found=Context [{0}]: Found session [{1}] but it isn''t a ClusterSession.
-ReplicationValve.session.indicator=Context [{0}]: Primarity of session [{1}] in request attribute [{2}] is [{3}].
+ReplicationValve.session.indicator=Context [{0}]: Primary status of session [{1}] in request attribute [{2}] is [{3}].
 ReplicationValve.session.invalid=Context [{0}]: Requested session [{1}] is invalid, removed or not replicated at this node.
 ReplicationValve.stats=Average request time=[{0}] ms with cluster overhead time=[{1}] ms for [{2}] requests, [{3}] send requests, [{4}] cross context requests, and [{5}] filter requests (Total request=[{6}] ms, total cluster request=[{7}] ms).
 
diff --git a/java/org/apache/catalina/loader/LocalStrings.properties b/java/org/apache/catalina/loader/LocalStrings.properties
index 25d2cf92eeb0..034194285d0c 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -31,7 +31,7 @@ webappClassLoader.checkThreadLocalsForLeaksNull=The web application [{0}] create
 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.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.clearRmi=Found RMI Target with stub 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
@@ -45,7 +45,7 @@ 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.restrictedPackage=Security violation, attempt to use restricted class [{0}]
-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.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 thread [{1}] of 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}]
diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index c22e1a745632..358669bbd765 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -54,7 +54,7 @@ persistentManager.loading=Loading [{0}] persisted sessions
 persistentManager.noStore=No Store configured, persistence disabled
 persistentManager.removeError=Error removing session [{0}] from the store
 persistentManager.serializeError=Error serializing Session [{0}]
-persistentManager.storeClearError=Error clearning all sessions from the store
+persistentManager.storeClearError=Error clearing all sessions from the store
 persistentManager.storeKeysException=Unable to determine the list of session IDs for sessions in the session store, assuming that the store is empty
 persistentManager.storeLoadError=Error swapping in sessions from the store
 persistentManager.storeLoadKeysError=Error loading sessions keys from the store
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index 7f34d349c56b..008546b0e92d 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -70,7 +70,7 @@ contextConfig.init=ContextConfig: Initializing
 contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
 contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}] for annotations
 contextConfig.inputStreamWebResource=Unable to process web resource [{0}] for annotations
-contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContentInitializers.
+contextConfig.invalidSciHandlesTypes=Unable to load class [{0}] to check against the @HandlesTypes annotation of one or more ServletContainerInitializers.
 contextConfig.jarFile=Unable to process Jar [{0}] for annotations
 contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
 contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/'' in Servlet 2.4
diff --git a/java/org/apache/catalina/startup/LocalStrings_es.properties b/java/org/apache/catalina/startup/LocalStrings_es.properties
index afb8cb443a06..8d46cb9e1d29 100644
--- a/java/org/apache/catalina/startup/LocalStrings_es.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_es.properties
@@ -46,7 +46,7 @@ contextConfig.init=ContextConfig: Inicializando
 contextConfig.inputStreamFile=No puedo procesar el fichero [{0}] para las anotaciones
 contextConfig.inputStreamJar=No puedo procesar la entrada de Jar [{0}] desde el Jar [{1}] para las anotaciones
 contextConfig.inputStreamWebResource=Imposible procesar el recurso web [{0}] para anotaciones
-contextConfig.invalidSciHandlesTypes=No puedo cargar la clase [{0}] para revisar contra la anotación  @HandlesTypes de uno o más ServletContentInitializers.
+contextConfig.invalidSciHandlesTypes=No puedo cargar la clase [{0}] para revisar contra la anotación  @HandlesTypes de uno o más ServletContainerInitializers.
 contextConfig.jspFile.error=El archivo JSP [{0}] debe de comenzar con ''/''
 contextConfig.jspFile.warning=AVISO: El archivo JSP [{0}] debe de comenzar con ''/'' en Servlet 2.4
 contextConfig.missingRealm=Algún reino (realm) no ha sido configurado para realizar la autenticación
diff --git a/java/org/apache/catalina/startup/LocalStrings_ja.properties b/java/org/apache/catalina/startup/LocalStrings_ja.properties
index 3b8d5131d641..5772a8eaf158 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ja.properties
@@ -73,7 +73,7 @@ contextConfig.init=ContextConfig: 初期化中\n
 contextConfig.inputStreamFile=ファイル [{0}] のアノテーションを処理できません
 contextConfig.inputStreamJar=Jar [{1}] の Jar エントリ [{0}] のアノテーションを処理できません
 contextConfig.inputStreamWebResource=Web リソース [{0}] のアノテーションを処理できません
-contextConfig.invalidSciHandlesTypes=1つ以上のServletContentInitializersの@HandlesTypesアノテーションに対してチェックするためにクラス [{0}] をロードできません。
+contextConfig.invalidSciHandlesTypes=1つ以上のServletContainerInitializerの@HandlesTypesアノテーションに対してチェックするためにクラス [{0}] をロードできません。
 contextConfig.jarFile=Jar [{0}] のアノテーションを処理できません
 contextConfig.jspFile.error=JSPファイル [{0}] は''/''で始まらなければいけません
 contextConfig.jspFile.warning=警告: Servlet 2.4ではJSPファイル [{0}] は''/''で始まらなければいけません
diff --git a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
index 805d0a92eb1e..16f069055f06 100644
--- a/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_zh_CN.properties
@@ -65,7 +65,7 @@ contextConfig.init=上下文配置: 正在初始化
 contextConfig.inputStreamFile=无法为注解处理文件[{0}]
 contextConfig.inputStreamJar=无法处理Jar实体[{0}]的注解，Jar：[{1}]
 contextConfig.inputStreamWebResource=不能处理注释的Web资源[{0}]
-contextConfig.invalidSciHandlesTypes=无法为核对一个或多个ServletContentInitializers的注解@HandlesTypes而加载类[{0}]
+contextConfig.invalidSciHandlesTypes=无法为核对一个或多个ServletContainerInitializers的注解@HandlesTypes而加载类[{0}]
 contextConfig.jarFile=无法处理Jar[{0}]的注解
 contextConfig.jspFile.error=JSP文件[{0}]必须以''/''开头。
 contextConfig.jspFile.warning=警告：在Servlet 2.4 中，JSP文件[{0}]必须以‘/’开头
diff --git a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
index 91c9339c252d..adddc293aba0 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 domainFilterInterceptor.member.refused=Member [{0}] was refused to join cluster
-domainFilterInterceptor.message.refused=Received message from cluster[{0}] was refused.
+domainFilterInterceptor.message.refused=Received message from cluster [{0}] was refused.
 
 encryptInterceptor.algorithm.required=Encryption algorithm is required, fully-specified e.g. AES/GCM/NoPadding
 encryptInterceptor.algorithm.switch=The EncryptInterceptor is using the insecure algorithm [{0}]. It is recommended to switch to using AES/GCM/NoPadding.
@@ -78,16 +78,16 @@ staticMembershipInterceptor.no.pingInterceptor=There is no TcpPingInterceptor. T
 staticMembershipInterceptor.sendLocalMember.failed=Local member notification failed.
 staticMembershipInterceptor.sendShutdown.failed=Shutdown notification failed.
 
-tcpFailureDetector.already.disappeared=Verification complete. Member already disappeared[{0}]
-tcpFailureDetector.failureDetection.failed=Unable to perform failure detection check, assuming member down.[{0}]
+tcpFailureDetector.already.disappeared=Verification complete. Member already disappeared [{0}]
+tcpFailureDetector.failureDetection.failed=Unable to perform failure detection check, assuming member down. [{0}]
 tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the TcpFailureDetector.
-tcpFailureDetector.member.disappeared=Verification complete. Member disappeared[{0}]
+tcpFailureDetector.member.disappeared=Verification complete. Member disappeared [{0}]
 tcpFailureDetector.memberDisappeared.verify=Received memberDisappeared[{0}] message. Will verify.
 tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we weren''t notified:[{0}]
 tcpFailureDetector.receivedPacket=Received a failure detector packet [{0}]
-tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
-tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
-tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
+tcpFailureDetector.still.alive=Verification complete. Member still alive [{0}]
+tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive. [{0}]
+tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead. [{0}]
 
 tcpPingInterceptor.ping.failed=Unable to send TCP ping.
 tcpPingInterceptor.pingFailed.pingThread=Unable to send ping from TCP ping thread.
diff --git a/java/org/apache/catalina/tribes/jmx/LocalStrings.properties b/java/org/apache/catalina/tribes/jmx/LocalStrings.properties
index 1abab465ade4..7258977828ee 100644
--- a/java/org/apache/catalina/tribes/jmx/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/jmx/LocalStrings.properties
@@ -16,6 +16,6 @@
 jmxRegistry.no.domain=JMX domain is not specified
 jmxRegistry.objectName.failed=The requested ObjectName [{0}] is not valid
 jmxRegistry.registerJmx.failed=Failed to register object [{0}] with name [{1}]
-jmxRegistry.registerJmx.notCompliant=The requested object[{0}] is not compliant with JMX specification
+jmxRegistry.registerJmx.notCompliant=The requested object [{0}] is not compliant with JMX specification
 jmxRegistry.unregisterJmx.failed=Failed to unregister MBean with name [{0}]
 jmxRegistry.unregisterJmx.notFound=The requested ObjectName [{0}] has not been registered in the MBeanServer
diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 6ab3bf6ff513..794b7ca06cd7 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -19,7 +19,7 @@ McastService.parseTTL=Unable to parse TTL: [{0}]
 McastService.payload=Unable to send payload update
 McastService.stopFail=Unable to stop the mcast service, level: [{0}]
 
-mcastService.exceed.maxPacketSize=Packet length[{0}] exceeds max packet size of [{1}] bytes.
+mcastService.exceed.maxPacketSize=Packet length [{0}] exceeds max packet size of [{1}] bytes.
 mcastService.missing.property=McastService:Required property [{0}] is missing.
 mcastService.noStart=Multicast send is not started or enabled.
 
@@ -63,9 +63,9 @@ staticMember.invalid.host=Invalid host [{0}]
 staticMember.invalid.uuidLength=UUID must be exactly 16 bytes, not:[{0}]
 
 staticMembershipProvider.heartbeat.failed=Unable to send StaticMembershipProvider.ping message.
-staticMembershipProvider.leftOver.ignored=Message[{0}] is ignored.
+staticMembershipProvider.leftOver.ignored=Message [{0}] is ignored.
 staticMembershipProvider.pingThread.failed=Unable to send ping.
-staticMembershipProvider.replyRequest.ignored=Message[{0}] is ignored.
+staticMembershipProvider.replyRequest.ignored=Message [{0}] is ignored.
 staticMembershipProvider.startMembership.noReplies=Received 0 replies, probably a timeout.
 staticMembershipProvider.stopMembership.sendFailed=Unable to send stop membership message.
 
diff --git a/java/org/apache/catalina/tribes/tipis/LocalStrings.properties b/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
index b85b37c8a494..e088b96b757e 100644
--- a/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
@@ -34,7 +34,7 @@ abstractReplicatedMap.unable.deserialize.MapMessage=Unable to deserialize MapMes
 abstractReplicatedMap.unable.diffObject=Unable to diff object. Will replicate the entire object instead.
 abstractReplicatedMap.unable.get=Unable to replicate out data for an AbstractReplicatedMap.get operation
 abstractReplicatedMap.unable.put=Unable to replicate out data for an AbstractReplicatedMap.put operation
-abstractReplicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup node
+abstractReplicatedMap.unable.relocate=Unable to relocate [{0}] to a new backup node
 abstractReplicatedMap.unable.remove=Unable to replicate out data for an AbstractReplicatedMap.remove operation
 abstractReplicatedMap.unable.replicate=Unable to replicate data.
 abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for key:[{0}]
@@ -53,5 +53,5 @@ mapMessage.deserialize.error.value=Failed to deserialize MapMessage value
 replicatedMap.member.disappeared=Member[{0}] disappeared. Related map entries will be relocated to the new node.
 replicatedMap.member.disappeared.unknown=Member[{0}] disappeared, but was not present in the map.
 replicatedMap.relocate.complete=Relocation of map entries was complete in [{0}] ms.
-replicatedMap.unable.relocate=Unable to relocate[{0}] to a new backup node
+replicatedMap.unable.relocate=Unable to relocate [{0}] to a new backup node
 replicatedMap.unableReplicate.completely=Unable to replicate backup key:[{0}]. Success nodes:[{1}]. Failed nodes:[{2}].
diff --git a/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties b/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
index 7a4ad9a184ee..18b1171e3eb5 100644
--- a/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/transport/nio/LocalStrings.properties
@@ -32,7 +32,7 @@ nioReplicationTask.error.register.key=Error registering key for read:[{0}]
 nioReplicationTask.exception.drainChannel=Exception caught in TcpReplicationThread.drainChannel.
 nioReplicationTask.process.clusterMsg.failed=Processing of cluster message failed.
 nioReplicationTask.unable.ack=Unable to send ACK back through channel, channel disconnected?: [{0}]
-nioReplicationTask.unable.drainChannel.ioe=IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed[{0}].
+nioReplicationTask.unable.drainChannel.ioe=IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed [{0}].
 
 nioSender.already.connected=NioSender is already in connected state.
 nioSender.datagram.already.established=Datagram channel has already been established. Connection might be in progress.
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 0cb4d4545b04..8d1800ee4de8 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -144,7 +144,7 @@ parameterLimitValve.invalidLimits=Each limit configuration must contain either a
 parameterLimitValve.invalidLine=Each line must contain at least one '=' character. Invalid line [{0}]
 parameterLimitValve.noConfiguration=No configuration resource found [{0}]
 parameterLimitValve.readConfiguration=Read configuration from [/WEB-INF/{0}]
-parameterLimitValve.readError=Error reading configurationpatternTokenizer.unexpectedParenthesis=Unexpected ')' in pattern
+parameterLimitValve.readError=Error reading configuration
 
 persistentValve.acquireFailed=The request for [{0}] did not obtain the per session Semaphore as no permit was available
 persistentValve.acquireInterrupted=The request for [{0}] did not obtain the per session Semaphore as it was interrupted while waiting for a permit
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties b/java/org/apache/coyote/http2/LocalStrings.properties
index 397de3363bc6..f36df9fee372 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -59,7 +59,7 @@ hpackhuffman.decode.illegalCharacterValue.end=The illegal [{0}] character was fo
 hpackhuffman.decode.illegalCharacterValue.start=The illegal [{0}] character was found when decoding the first character in an HTTP/2 header field value
 hpackhuffman.huffmanEncodedHpackValueDidNotEndWithEOS=Huffman encoded value in HPACK headers did not end with EOS padding
 hpackhuffman.stringLiteralEOS=Huffman encoded value in HPACK headers contained the EOS symbol
-hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of EOS padding were provided at the end of an Huffman encoded string literal
+hpackhuffman.stringLiteralTooMuchPadding=More than 7 bits of EOS padding were provided at the end of a Huffman encoded string literal
 
 http2Parser.error=Connection [{0}], Stream [{1}], Frame type [{2}], Error
 http2Parser.headerLimitCount=Connection [{0}], Stream [{1}], Too many headers
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index c9d4215a35f2..db4b29c76c1b 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -79,7 +79,7 @@ jsp.error.file.cannot.read=Cannot read file: [{0}]
 jsp.error.file.close=Exception closing reader
 jsp.error.file.not.found=JSP file [{0}] not found
 jsp.error.flush=Exception occurred when flushing data
-jsp.error.fragmentwithtype=Cannot specify both ''fragment'' and ''type'' attributes.  If ''fragment'' is present, ''type'' is fixed as ''{0}''
+jsp.error.fragmentwithtype=Cannot specify both ''fragment'' and ''type'' attributes. If ''fragment'' is present, ''type'' is fixed as ''{0}''
 jsp.error.function.classnotfound=The class [{0}] specified in TLD for the function [{1}] cannot be found: [{2}]
 jsp.error.include.exception=Unable to include [{0}]
 jsp.error.include.tag=Invalid jsp:include tag
@@ -228,7 +228,7 @@ jsp.error.tei.invalid.attributes=Validation error messages from TagExtraInfo for
 jsp.error.teiclass.instantiation=Failed to load or instantiate TagExtraInfo class: [{0}]
 jsp.error.text.has_subelement=<jsp:text> must not have any subelements
 jsp.error.tld.fn.duplicate.name=Duplicate function name [{0}] in tag library [{1}]
-jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in TLD.  Tag Library: [{0}], Function: [{1}]
+jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in TLD. Tag Library: [{0}], Function: [{1}]
 jsp.error.tld.invalid_tld_file=Invalid tld file: [{0}], see JSP specification section 7.3.1 for more details
 jsp.error.tld.mandatory.element.missing=Mandatory TLD element [{0}] missing or empty in TLD [{1}]
 jsp.error.tld.missing=Unable to find taglib [{0}] for URI: [{1}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index d00ffae6185e..dea158140441 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -24,7 +24,7 @@ channel.nio.ssl.closing=Channel is in closing state.
 channel.nio.ssl.eofDuringHandshake=EOF during handshake.
 channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
 channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}] bytes
-channel.nio.ssl.foundHttp=Found an plain text HTTP request on what should be an encrypted TLS connection
+channel.nio.ssl.foundHttp=Found a plain text HTTP request on what should be an encrypted TLS connection
 channel.nio.ssl.handshakeError=Handshake error
 channel.nio.ssl.handshakeWrapPending=There is already handshake data waiting to be wrapped
 channel.nio.ssl.handshakeWrapQueueTooLong=The queue of handshake data to be wrapped has grown too long
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index 10f6d8e301e5..33486aae7e3d 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -24,7 +24,7 @@ pemFile.encryption.broken=The PEM file [{0}] is using [{1}] which is considered
 pemFile.encryption.insecure=The PEM file [{0}] is using [{1}] which is considered insecure as it is vulnerable to a brute-force attack
 pemFile.noMultiPrimes=The PKCS#1 certificate is in multi-prime format and Java does not provide an API for constructing an RSA private key object from that format
 pemFile.noPassword=A password is required to decrypt the private key
-pemFile.notPbkdf2=The OID [{0}] is not the correct OID for PKBDF2 which is the only permitted KDF for PBES2
+pemFile.notPbkdf2=The OID [{0}] is not the correct OID for PBKDF2 which is the only permitted KDF for PBES2
 pemFile.notValidRFC5915=The provided key file does not conform to RFC 5915
 pemFile.parseError=Unable to parse the key from [{0}]
 pemFile.parseError.algorithm=Unable to parse the key using algorithm [{0}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
index 842b16195893..b903782df985 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_fr.properties
@@ -27,7 +27,7 @@ pemFile.encryption.broken=Le fichier PEM [{0}] utilise [{1}] ce qui être consid
 pemFile.encryption.insecure=Le fichier PEM [{0}] utilise [{1}] ce qui être considéré comme non sécurisé car il est vulnérable à une attaque par force brute
 pemFile.noMultiPrimes=Le certificat PKCS#1 est dans un format mutli-prime et Java ne fournit pas d'API pour construire une clé privée RSA à partir de ce format
 pemFile.noPassword=Un mot de passe est requis pour déchiffrer la clé privée
-pemFile.notPbkdf2=L''OID [{0}] n''est pas un OID correct pour PKBDF2 qui est le seul KDF autorisé pour PBES2
+pemFile.notPbkdf2=L''OID [{0}] n''est pas un OID correct pour PBKDF2 qui est le seul KDF autorisé pour PBES2
 pemFile.notValidRFC5915=La fichier de clé fourni ne se conforme pas à la RFC 5915
 pemFile.parseError=Impossible de parser la clé de [{0}]
 pemFile.parseError.algorithm=Impossible de traiter la clé en utilisant l''algorithme [{0}]
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
index 08f1779a5979..4abf4b4b1ad2 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings_ja.properties
@@ -27,7 +27,7 @@ pemFile.encryption.broken=PEMファイル [{0}] は [{1}] を使用していま
 pemFile.encryption.insecure=PEMファイル [{0}] は [{1}] を使用していますが、これは総当たり攻撃に対して脆弱であるため、安全ではないと考えられます
 pemFile.noMultiPrimes=PKCS#1 証明書は multi-prime RSA フォーマットですが、Java はそのようなフォーマットに対する RSA 秘密鍵を構築する API を提供していません
 pemFile.noPassword=秘密鍵を復号するにはパスワードが必要です
-pemFile.notPbkdf2=OID [{0}] は、PBES2 に唯一許可される KDF である PKBDF2 の正しい OID ではありません
+pemFile.notPbkdf2=OID [{0}] は、PBES2 に唯一許可される KDF である PBKDF2 の正しい OID ではありません
 pemFile.notValidRFC5915=与えられたキーファイルは RFC 5915 に準拠していません
 pemFile.parseError=秘密鍵ファイル [{0}] を解析できません
 pemFile.parseError.algorithm=アルゴリズム [{0}] を使用してキーを解析できません
diff --git a/java/org/apache/tomcat/websocket/LocalStrings.properties b/java/org/apache/tomcat/websocket/LocalStrings.properties
index a520f332cf41..810a1f5deaa7 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings.properties
@@ -49,7 +49,7 @@ perMessageDeflate.alreadyClosed=The transformer has been closed and may no longe
 perMessageDeflate.deflateFailed=Failed to decompress a compressed WebSocket frame
 perMessageDeflate.duplicateParameter=Duplicate definition of the [{0}] extension parameter
 perMessageDeflate.invalidState=Invalid state
-perMessageDeflate.invalidWindowSize=An invalid windows of [{1}] size was specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
+perMessageDeflate.invalidWindowSize=An invalid window of [{1}] size was specified for [{0}]. Valid values are whole numbers from 8 to 15 inclusive.
 perMessageDeflate.next.ise=The next transformation of type [{0}] returned unexpected result
 perMessageDeflate.unknownParameter=An unknown extension parameter [{0}] was defined