Alphabetical order
diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 76e3dd9..23dc64f 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -175,11 +175,11 @@
openssllistener.java22=The FFM API from Java 22 is not available, using OpenSSL requires Apache Tomcat Native
openssllistener.sslInit=OpenSSL initialization failed
-propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be null
-propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be empty
-propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping file [{0}]
propertiesRoleMappingListener.linkedRole=Successfully linked application role [{0}] to technical role [{1}]
propertiesRoleMappingListener.linkedRoleCount=Linked [{0}] application roles to technical roles
+propertiesRoleMappingListener.roleMappingFileEmpty=Role mapping file cannot be empty
+propertiesRoleMappingListener.roleMappingFileFail=Failed to load role mapping file [{0}]
+propertiesRoleMappingListener.roleMappingFileNull=Role mapping file cannot be null
standardContext.applicationListener=Error configuring application listener of class [{0}]
standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s)
diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 9bd759b..2bd30f6 100644
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -28,12 +28,12 @@
# Default error page should not have '[' ']' symbols around substituted text fragments.
# https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
+errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.description=Description
errorReportValve.errorPageIOException=Unable to display error page at [{0}] due to an exception
errorReportValve.errorPageNotFound=Unable to find a static error page at [{0}]
errorReportValve.exception=Exception
errorReportValve.exceptionReport=Exception Report
-errorReportValve.contentTypeFail=Failure to set the content-type of response
errorReportValve.message=Message
errorReportValve.noDescription=No description available
errorReportValve.note=Note
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index 65f8feb..9d50d0b 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -212,6 +212,7 @@
jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value for trimDirectiveWhitespaces
jsp.error.tag.language.nonjava=Tag directive: invalid language attribute
jsp.error.tag.multi.pageencoding=Tag directive must not have multiple occurrences of pageencoding
+jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.tagdirective.badbodycontent=Invalid body-content [{0}] in tag directive
jsp.error.tagfile.badSuffix=Missing ".tag" suffix in tag file path [{0}]
jsp.error.tagfile.illegalPath=Illegal tag file path: [{0}], must start with "/WEB-INF/tags" or "/META-INF/tags"
@@ -219,7 +220,6 @@
jsp.error.tagfile.nameFrom.badAttribute=The attribute directive declared at line [{1}] with name [{0}] that matches the name-from-attribute value of this variable directive must be of type java.lang.String, must be "required" and must not be a "rtexprvalue".
jsp.error.tagfile.nameFrom.noAttribute=Cannot find an attribute directive with a name [{0}] that matches the name-from-attribute value of this variable directive
jsp.error.tagfile.nameNotUnique=The value of [{0}] and the value of [{1}] in line [{2}] are the same.
-jsp.error.tagHandlerPool=Cannot create tag handler pool [{0}]
jsp.error.taglibDirective.absUriCannotBeResolved=The absolute uri: [{0}] cannot be resolved in either web.xml or the jar files deployed with this application
jsp.error.taglibDirective.both_uri_and_tagdir=Both 'uri' and 'tagdir' attributes specified
jsp.error.taglibDirective.missing.location=Neither 'uri' nor 'tagdir' attribute specified
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 2cc689c..e9fdd7d 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -121,8 +121,8 @@
endpoint.tls.cert.encodingError=Certificate fingerprints not available
endpoint.tls.cert.noCerts=Certificate details not available as the certificate chain returned from the SSLContext was empty
endpoint.tls.info=Connector [{0}], TLS virtual host [{1}], certificate type [{2}] configured from {3} with trust store [{4}]
-endpoint.tls.info.cert.pem=key [{0}], certificate [{1}] and certificate chain [{2}]
endpoint.tls.info.cert.keystore=keystore [{0}] using alias [{1}]
+endpoint.tls.info.cert.pem=key [{0}], certificate [{1}] and certificate chain [{2}]
endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this endpoint
endpoint.warn.executorShutdown=The executor associated with thread pool [{0}] has not fully shutdown. Some application threads may still be running.
endpoint.warn.incorrectConnectionCount=Incorrect connection count, multiple calls to socket.close for the same socket.
diff --git a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
index 4e57393..6a3d1fd 100644
--- a/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/jsse/LocalStrings.properties
@@ -21,10 +21,10 @@
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.notValidRFC5915=The provided key file does not conform to RFC 5915
pemFile.notPbkdf2=The OID [{0}] is not the correct OID for PKBDF2 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.unknownEncryptedFormat=The format [{0}] is not a recognised encrypted PEM file format
pemFile.unknownEncryptionAlgorithm=The encryption algorithm with DER encoded OID of [{0}] was not recognised
+pemFile.unknownPkcs8Algorithm=The PKCS#8 encryption algorithm with DER encoded OID of [{0}] was not recognised
pemFile.unknownPrfAlgorithm=The pseudo random function with DER encoded OID of [{0}] was not recognised
-pemFile.unknownPkcs8Algorithm=The PKCS#8 encryption algorithm with DER encoded OID of [{0}] was not recognised
\ No newline at end of file
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
index ad0d1d4..dc6294f 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -53,10 +53,10 @@
openssl.errorConfiguringLocations=Error configuring CA certificate locations: [{0}]
openssl.errorInit=Non fatal error initializing certificates or configuration: [{0}]
openssl.errorLoadingCertificate=Error loading certificate: [{0}]
+openssl.errorLoadingCertificateRevocationListWithError=Error loading certificate revocation [{0}] with error [{1}]
openssl.errorLoadingCertificateWithError=Error loading certificate [{0}] with error [{1}]
openssl.errorLoadingPassword=Error loading password file: [{0}]
openssl.errorLoadingPrivateKey=Error loading private key: [{0}]
-openssl.errorLoadingCertificateRevocationListWithError=Error loading certificate revocation [{0}] with error [{1}]
openssl.errorPrivateKeyCheck=Private key does not match the certificate public key: [{0}]
openssl.errorReadingPEMParameters=Failed reading PEM parameters [{0}] for certificate [{1}]
openssl.errorSSLCtxInit=Error initializing SSL context
@@ -84,17 +84,15 @@
opensslconf.resultCommand=OpenSSLConf command (name [{0}], value [{1}]) returned [{2}]
opensslconf.unknownCommandType=SSL_CONF command [{0}] type unknown
-sessionContext.nullTicketKeys=Null keys
-
openssllibrary.ciphersFailure=Failed getting cipher list
openssllibrary.currentFIPSMode=Current FIPS mode: [{0}]
openssllibrary.engineError=Error creating engine
openssllibrary.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force entering FIPS mode, but library is already in FIPS mode [{0}]
+openssllibrary.errorSettingSSLRandomSeed=Setting random seed [{0}] caused error [{1}]
openssllibrary.initializeFIPSFailed=Failed to enter FIPS mode
openssllibrary.initializeFIPSSuccess=Successfully entered FIPS mode
openssllibrary.initializedOpenSSL=OpenSSL successfully initialized using FFM [{0}]
openssllibrary.initializingFIPS=Initializing FIPS mode...
-openssllibrary.errorSettingSSLRandomSeed=Setting random seed [{0}] caused error [{1}]
openssllibrary.requireNotInFIPSMode=The listener is configured to require the library to already be in FIPS mode, but it was not in FIPS mode
openssllibrary.skipFIPSInitialization=Already in FIPS mode; skipping FIPS initialization.
openssllibrary.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been initialized
@@ -102,3 +100,4 @@
openssllibrary.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already been initialized
openssllibrary.wrongFIPSMode=Unexpected value of FIPSMode option of AprLifecycleListener: [{0}]
+sessionContext.nullTicketKeys=Null keys
